Changeset 3590

Timestamp:

Jun 20, 2011 6:16:08 AM (13 years ago)

Author:

ming

Message:

Closed #1309: Add video device capability to support changing position and hiding of renderer window.

Provide SDL implementation for both capabilities.

Location:

pjproject/branches/projects/2.0-dev/pjmedia

Files:

• include/pjmedia-videodev/videodev.h (modified) (2 diffs)
• src/pjmedia-videodev/sdl_dev.c (modified) (3 diffs)

pjproject/branches/projects/2.0-dev/pjmedia/include/pjmedia-videodev/videodev.h

@@ -110 +110 @@
      */
     PJMEDIA_VID_DEV_CAP_OUTPUT_RESIZE = 8,
+
+    /**
+     * Support for setting the video window's position.
+     * Value is pjmedia_coord specifying the window's new coordinate.
+     */
+    PJMEDIA_VID_DEV_CAP_OUTPUT_POSITION = 16,
+
+    /**
+     * Support for setting the video output's visibility.
+     * The value of this capability is a pj_bool_t containing boolean
+     * PJ_TRUE or PJ_FALSE.
+     */
+    PJMEDIA_VID_DEV_CAP_OUTPUT_HIDE = 32,
 
     /**
@@ -299 +312 @@
     pjmedia_rect_size disp_size;
 
+    /**
+     * Video window position. This setting is optional, and will only be used
+     * if PJMEDIA_VID_DEV_CAP_OUTPUT_POSITION is set in the flags.
+     */
+    pjmedia_coord window_pos;
+
+    /**
+     * Video window's visibility. This setting is optional, and will only be
+     * used if PJMEDIA_VID_DEV_CAP_OUTPUT_HIDE is set in the flags.
+     */
+    pj_bool_t window_hide;
+
 } pjmedia_vid_param;
 

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/sdl_dev.c

@@ -1051 +1051 @@
             goto on_error;
         }
-
-        pjmedia_format_copy(&strm->conv_param.src, &param->fmt);
-        pjmedia_format_copy(&strm->conv_param.dst, &param->fmt);
-        /*
-        status = pjmedia_converter_create(NULL, pool, &strm->conv_param,
-                                          &strm->conv);
-         */
     }
 
     /* Apply the remaining settings */
-    if (param->flags & PJMEDIA_VID_DEV_CAP_OUTPUT_WINDOW) {
+    if (param->flags & PJMEDIA_VID_DEV_CAP_OUTPUT_POSITION) {
         sdl_stream_set_cap(&strm->base,
-                           PJMEDIA_VID_DEV_CAP_OUTPUT_WINDOW,
-                           &param->window);
+                           PJMEDIA_VID_DEV_CAP_OUTPUT_POSITION,
+                           &param->window_pos);
+    }
+    if (param->flags & PJMEDIA_VID_DEV_CAP_OUTPUT_HIDE) {
+        sdl_stream_set_cap(&strm->base,
+                           PJMEDIA_VID_DEV_CAP_OUTPUT_HIDE,
+                           &param->window_hide);
     }
 
@@ -1111 +1109 @@
     if (cap == PJMEDIA_VID_DEV_CAP_OUTPUT_WINDOW)
     {
+        pval = strm->window;
         return PJ_SUCCESS;
-    } else if (cap == PJMEDIA_VID_DEV_CAP_FORMAT) {
+    } else if (cap == PJMEDIA_VID_DEV_CAP_OUTPUT_POSITION) {
+        SDL_GetWindowPosition(strm->window, &((pjmedia_coord *)pval)->x,
+                              &((pjmedia_coord *)pval)->y);
         return PJ_SUCCESS;
     } else {
@@ -1130 +1131 @@
     PJ_ASSERT_RETURN(s && pval, PJ_EINVAL);
 
-    if (cap == PJMEDIA_VID_DEV_CAP_OUTPUT_WINDOW) {
+    if (cap == PJMEDIA_VID_DEV_CAP_OUTPUT_POSITION) {
+        SDL_SetWindowPosition(strm->window, ((pjmedia_coord *)pval)->x,
+                              ((pjmedia_coord *)pval)->y);
+        return PJ_SUCCESS;
+    } else if (cap == PJMEDIA_VID_DEV_CAP_OUTPUT_HIDE) {
+        if (*(pj_bool_t *)pval)
+            SDL_HideWindow(strm->window);
+        else
+            SDL_ShowWindow(strm->window);
         return PJ_SUCCESS;
     } else if (cap == PJMEDIA_VID_DEV_CAP_FORMAT) {