Changeset 4035 for pjproject/trunk

Timestamp:

Apr 10, 2012 12:23:35 PM (13 years ago)

Author:

ming

Message:

Re #1446 (misc): Modify SDL dev to:

• Resize renderer (instead of recreating it) if format does not change.
• Create window in the requested position if PJMEDIA_VID_DEV_CAP_OUTPUT_POSITION is specified.

File:

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

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

@@ -735 +735 @@
                                strm->param.window.info.window);
         } else {
+            int x, y;
+
+            x = y = SDL_WINDOWPOS_CENTERED;
+            if (strm->param.flags & PJMEDIA_VID_DEV_CAP_OUTPUT_POSITION) {
+                x = strm->param.window_pos.x;
+                y = strm->param.window_pos.y;
+            }
+
             /* Create the window where we will draw. */
             strm->window = SDL_CreateWindow("pjmedia-SDL video",
@@ -831 +839 @@
     pj_status_t status;
 
+    if (new_fmt->id == strm->param.fmt.id) {
+        SDL_SetWindowSize(strm->window, new_fmt->det.vid.size.w,
+                          new_fmt->det.vid.size.h);
+        return resize_disp(strm, &new_fmt->det.vid.size);
+    }
+
     /* Recreate SDL renderer */
     status = sdl_create_rend(strm, (new_fmt? new_fmt :
@@ -934 +948 @@
     pj_list_insert_after(&strm->sf->streams, &strm->list_entry);
     pj_mutex_unlock(strm->sf->mutex);
-
-    /* Apply the remaining settings */
-    if (param->flags & PJMEDIA_VID_DEV_CAP_OUTPUT_POSITION) {
-        sdl_stream_set_cap(&strm->base,
-                           PJMEDIA_VID_DEV_CAP_OUTPUT_POSITION,
-                           &param->window_pos);
-    }
 
     /* Done */