Changeset 4520

Timestamp:

May 16, 2013 11:32:07 AM (11 years ago)

Author:

bennylp

Message:

Misc re #1630: added more error logging to SDL, to print SDL error message when an operation fails

File:

• pjproject/trunk/pjmedia/src/pjmedia-videodev/sdl_dev.c (modified) (7 diffs)

pjproject/trunk/pjmedia/src/pjmedia-videodev/sdl_dev.c

@@ -23 +23 @@
 
 #if defined(PJMEDIA_VIDEO_DEV_HAS_SDL) && PJMEDIA_VIDEO_DEV_HAS_SDL != 0
-
 #include <SDL.h>
 #include <SDL_syswm.h>
@@ -262 +261 @@
 };
 
+/*
+ * Util
+ */
+static void sdl_log_err(const char *op)
+{
+    PJ_LOG(1,(THIS_FILE, "%s error: %s", op, SDL_GetError()));
+}
 
 /****************************************************************************
@@ -288 +294 @@
 
     if (SDL_Init(SDL_INIT_VIDEO)) {
-        PJ_LOG(3, (THIS_FILE, "Failed initializing SDL"));
+        sdl_log_err("SDL_Init()");
         return PJMEDIA_EVID_INIT;
     }
@@ -734 +740 @@
             strm->window = SDL_CreateWindowFrom(
                                strm->param.window.info.window);
+            if (!strm->window) {
+                sdl_log_err("SDL_CreateWindowFrom()");
+                return PJMEDIA_EVID_SYSERR;
+            }
         } else {
             int x, y;
@@ -749 +759 @@
                                             strm->param.disp_size.h,
                                             flags);
+            if (!strm->window) {
+                sdl_log_err("SDL_CreateWindow()");
+                return PJMEDIA_EVID_SYSERR;
+            }
         }
-        if (!strm->window)
-            return PJMEDIA_EVID_SYSERR;
     }
 
@@ -759 +771 @@
       */
     strm->renderer = SDL_CreateRenderer(strm->window, -1, 0);
-    if (!strm->renderer)
+    if (!strm->renderer) {
+        sdl_log_err("SDL_CreateRenderer()");
         return PJMEDIA_EVID_SYSERR;
+    }
 
 #if PJMEDIA_VIDEO_DEV_SDL_HAS_OPENGL
     if (strm->param.rend_id == OPENGL_DEV_IDX) {
         strm->gl_context = SDL_GL_CreateContext(strm->window);
-        if (!strm->gl_context)
+        if (!strm->gl_context) {
+            sdl_log_err("SDL_GL_CreateContext()");
             return PJMEDIA_EVID_SYSERR;
+        }
         SDL_GL_MakeCurrent(strm->window, strm->gl_context);
 
@@ -797 +813 @@
                                           SDL_TEXTUREACCESS_STREAMING,
                                           strm->rect.w, strm->rect.h);
-        if (strm->scr_tex == NULL)
+        if (strm->scr_tex == NULL) {
+            sdl_log_err("SDL_CreateTexture()");
             return PJMEDIA_EVID_SYSERR;
+        }
     
         strm->pitch = strm->rect.w * SDL_BYTESPERPIXEL(sdl_info->sdl_format);