Changeset 3864 for pjproject/trunk

Timestamp:

Oct 26, 2011 9:01:53 AM (13 years ago)

Author:

ming

Message:

Fixed #1401: Add support for video device's window flags

Now support flags PJMEDIA_VID_DEV_WND_BORDER and PJMEDIA_VID_DEV_WND_RESIZABLE.

Location:

pjproject/trunk

Files:

• pjmedia/include/pjmedia-videodev/videodev.h (modified) (3 diffs)
• pjmedia/src/pjmedia-videodev/sdl_dev.c (modified) (4 diffs)
• pjmedia/src/pjmedia-videodev/videodev.c (modified) (2 diffs)
• pjsip-apps/src/pjsua/pjsua_app.c (modified) (2 diffs)
• pjsip/include/pjsua-lib/pjsua.h (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_acc.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_vid.c (modified) (10 diffs)

pjproject/trunk/pjmedia/include/pjmedia-videodev/videodev.h

@@ -112 +112 @@
 
 /**
+ * Enumeration of window flags.
+ */
+typedef enum pjmedia_vid_dev_wnd_flag
+{
+    /**
+     * Window with border.
+     */
+    PJMEDIA_VID_DEV_WND_BORDER = 1,
+
+    /**
+     * Window can be resized.
+     */
+    PJMEDIA_VID_DEV_WND_RESIZABLE = 2
+
+} pjmedia_vid_dev_wnd_flag;
+
+
+/**
  * Device index constants.
  */
@@ -238 +256 @@
      */
     PJMEDIA_VID_DEV_CAP_SWITCH = 256,
+
+    /**
+     * Support for setting the output video window's flags.
+     * The value of this capability is a bitmask combination of
+     * #pjmedia_vid_dev_wnd_flag.
+     */
+    PJMEDIA_VID_DEV_CAP_OUTPUT_WINDOW_FLAGS = 512,
 
     /**
@@ -422 +447 @@
     pjmedia_orient orient;
 
+    /**
+     * Video window flags. This setting is optional, and will only be used
+     * if PJMEDIA_VID_DEV_CAP_OUTPUT_WINDOW_FLAGS is set in the flags.
+     */
+    unsigned window_flags;
+
 } pjmedia_vid_dev_param;
 

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

@@ -494 +494 @@
                          PJMEDIA_VID_DEV_CAP_OUTPUT_RESIZE;
         ddi->info.caps |= PJMEDIA_VID_DEV_CAP_OUTPUT_WINDOW;
+        ddi->info.caps |= PJMEDIA_VID_DEV_CAP_OUTPUT_WINDOW_FLAGS;
 
         for (j = 0; j < ddi->info.fmt_cnt; j++) {
@@ -700 +701 @@
 
     if (!strm->window) {
-        Uint32 flags = /*SDL_WINDOW_RESIZABLE; */ SDL_WINDOW_BORDERLESS;
+        Uint32 flags = 0;
+        
+        if (strm->param.flags & PJMEDIA_VID_DEV_CAP_OUTPUT_WINDOW_FLAGS) {
+            if (!(strm->param.window_flags & PJMEDIA_VID_DEV_WND_BORDER))
+                flags |= SDL_WINDOW_BORDERLESS;
+            if (strm->param.window_flags & PJMEDIA_VID_DEV_WND_RESIZABLE)
+                flags |= SDL_WINDOW_RESIZABLE;
+        } else {
+            flags |= SDL_WINDOW_BORDERLESS;
+        }
 
         if (!((strm->param.flags & PJMEDIA_VID_DEV_CAP_OUTPUT_HIDE) &&
@@ -971 +981 @@
     {
         pi->flags |= PJMEDIA_VID_DEV_CAP_OUTPUT_HIDE;
+    }
+    if (sdl_stream_get_cap(s, PJMEDIA_VID_DEV_CAP_OUTPUT_WINDOW_FLAGS,
+                           &pi->window_flags) == PJ_SUCCESS)
+    {
+        pi->flags |= PJMEDIA_VID_DEV_CAP_OUTPUT_WINDOW_FLAGS;
     }
 
@@ -1038 +1053 @@
     } else if (cap == PJMEDIA_VID_DEV_CAP_OUTPUT_HIDE) {
         Uint32 flag = SDL_GetWindowFlags(strm->window);
-        *((pj_bool_t *)pval) = (flag | SDL_WINDOW_HIDDEN)? PJ_TRUE: PJ_FALSE;
+        *((pj_bool_t *)pval) = (flag & SDL_WINDOW_HIDDEN)? PJ_TRUE: PJ_FALSE;
+        return PJ_SUCCESS;
+    } else if (cap == PJMEDIA_VID_DEV_CAP_OUTPUT_WINDOW_FLAGS) {
+        Uint32 flag = SDL_GetWindowFlags(strm->window);
+        unsigned *wnd_flags = (unsigned *)pval;
+        if (!(flag & SDL_WINDOW_BORDERLESS))
+            *wnd_flags |= PJMEDIA_VID_DEV_WND_BORDER;
+        if (flag & SDL_WINDOW_RESIZABLE)
+            *wnd_flags |= PJMEDIA_VID_DEV_WND_RESIZABLE;
         return PJ_SUCCESS;
     }

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

@@ -47 +47 @@
     DEFINE_CAP("preview",       "Input preview"),
     DEFINE_CAP("orientation",   "Video orientation"),
-    DEFINE_CAP("switch",        "Switch device")
+    DEFINE_CAP("switch",        "Switch device"),
+    DEFINE_CAP("wndflags",      "Window flags")
 };
 
@@ -189 +190 @@
      * to switch immediately).
      */
+    case PJMEDIA_VID_DEV_CAP_OUTPUT_WINDOW_FLAGS:
+        FIELD_INFO(window_flags);
+        break;
     default:
         return PJMEDIA_EVID_INVCAP;

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -3867 +3867 @@
     acc_cfg->vid_in_auto_show = app_config.vid.in_auto_show;
     acc_cfg->vid_out_auto_transmit = app_config.vid.out_auto_transmit;
+    /* Note that normally GUI application will prefer a borderless
+     * window.
+     */
+    acc_cfg->vid_wnd_flags = PJMEDIA_VID_DEV_WND_BORDER |
+                             PJMEDIA_VID_DEV_WND_RESIZABLE;
     acc_cfg->vid_cap_dev = app_config.vid.vcapture_dev;
     acc_cfg->vid_rend_dev = app_config.vid.vrender_dev;
@@ -4022 +4027 @@
                 int dev_id = atoi(argv[4]);
                 if (on) {
-                    pjsua_vid_preview_start(dev_id, NULL);
+                    pjsua_vid_preview_param param;
+
+                    pjsua_vid_preview_param_default(&param);
+                    param.wnd_flags = PJMEDIA_VID_DEV_WND_BORDER |
+                                      PJMEDIA_VID_DEV_WND_RESIZABLE;
+                    pjsua_vid_preview_start(dev_id, &param);
                     arrange_window(pjsua_vid_preview_get_win(dev_id));
                 } else {

pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

@@ -2747 +2747 @@
 
     /**
+     * Specify video window's flags. The value is a bitmask combination of
+     * #pjmedia_vid_dev_wnd_flag.
+     *
+     * Default: 0
+     */
+    unsigned         vid_wnd_flags;
+
+    /**
      * Specify the default capture device to be used by this account. If
      * \a vid_out_auto_transmit is enabled, this device will be used for
@@ -5739 +5747 @@
     pj_bool_t                   show;
 
+    /**
+     * Window flags.  The value is a bitmask combination of
+     * #pjmedia_vid_dev_wnd_flag.
+     *
+     * Default: 0.
+     */
+    unsigned                    wnd_flags;
+
 } pjsua_vid_preview_param;
 

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c

@@ -1065 +1065 @@
     acc->cfg.vid_in_auto_show = cfg->vid_in_auto_show;
     acc->cfg.vid_out_auto_transmit = cfg->vid_out_auto_transmit;
+    acc->cfg.vid_wnd_flags = cfg->vid_wnd_flags;
     acc->cfg.vid_cap_dev = cfg->vid_cap_dev;
     acc->cfg.vid_rend_dev = cfg->vid_rend_dev;

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_vid.c

@@ -389 +389 @@
                                   pjmedia_vid_dev_index cap_id,
                                   pj_bool_t show,
+                                  unsigned wnd_flags,
                                   pjsua_vid_win_id *id)
 {
@@ -433 +434 @@
                                     &hide);
 
+            pjmedia_vid_dev_stream_set_cap(
+                                strm, PJMEDIA_VID_DEV_CAP_OUTPUT_WINDOW_FLAGS,
+                                &wnd_flags);
+
             /* Done */
             *id = wid;
@@ -483 +488 @@
             vp_param.vidparam.flags |= PJMEDIA_VID_DEV_CAP_OUTPUT_HIDE;
             vp_param.vidparam.window_hide = !show;
+            vp_param.vidparam.flags |= PJMEDIA_VID_DEV_CAP_OUTPUT_WINDOW_FLAGS;
+            vp_param.vidparam.window_flags = wnd_flags;
         }
 
@@ -544 +551 @@
         vp_param.vidparam.flags |= PJMEDIA_VID_DEV_CAP_OUTPUT_HIDE;
         vp_param.vidparam.window_hide = !show;
+        vp_param.vidparam.flags |= PJMEDIA_VID_DEV_CAP_OUTPUT_WINDOW_FLAGS;
+        vp_param.vidparam.window_flags = wnd_flags;
 
         status = pjmedia_vid_port_create(w->pool, &vp_param, &w->vp_rend);
@@ -787 +796 @@
                                     PJSUA_INVALID_ID,
                                     acc->cfg.vid_in_auto_show,
+                                    acc->cfg.vid_wnd_flags,
                                     &wid);
             if (status != PJ_SUCCESS) {
@@ -826 +836 @@
         if (si->dir & PJMEDIA_DIR_ENCODING && !call->local_hold)
         {
+            pjsua_acc *acc = &pjsua_var.acc[call_med->call->acc_id];
             pjsua_vid_win *w;
             pjsua_vid_win_id wid;
@@ -856 +867 @@
                                         //acc->cfg.vid_cap_dev,
                                         PJSUA_HIDE_WINDOW,
+                                        acc->cfg.vid_wnd_flags,
                                         &wid);
                 if (status != PJ_SUCCESS) {
@@ -1071 +1083 @@
 
     status = create_vid_win(PJSUA_WND_TYPE_PREVIEW, NULL, rend_id, id,
-                            prm->show, &wid);
+                            prm->show, prm->wnd_flags, &wid);
     if (status != PJ_SUCCESS) {
         PJSUA_UNLOCK();
@@ -1848 +1860 @@
     new_wid = vid_preview_get_win(cap_dev, PJ_FALSE);
     if (new_wid == PJSUA_INVALID_ID) {
+        pjsua_acc *acc = &pjsua_var.acc[call_med->call->acc_id];
+
         /* Create preview video window */
         status = create_vid_win(PJSUA_WND_TYPE_PREVIEW,
@@ -1854 +1868 @@
                                 cap_dev,
                                 PJSUA_HIDE_WINDOW,
-                                &new_wid);
+                                acc->cfg.vid_wnd_flags,
+                                &new_wid);
         if (status != PJ_SUCCESS)
             goto on_error;