Changeset 5961

Timestamp:

Mar 29, 2019 1:52:59 AM (6 years ago)

Author:

ming

Message:

Fixed #2187: Avoid starting video capture if the setting vid_out_auto_transmit is false

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua_internal.h (modified) (1 diff)
• src/pjsua-lib/pjsua_vid.c (modified) (3 diffs)

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

@@ -411 +411 @@
     pj_bool_t                    preview_running;/**< Preview is started*/
     pj_bool_t                    is_native;     /**< Preview is by dev  */
+    pj_bool_t                    cap_started;   /**< Has the capture
+                                                     been started?      */
 } pjsua_vid_win;
 

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

@@ -1146 +1146 @@
 
             /* Start capturer */
-            if (just_created) {
+            if (just_created && acc->cfg.vid_out_auto_transmit) {
                 status = pjmedia_vid_port_start(w->vp_cap);
                 if (status != PJ_SUCCESS) {
@@ -1152 +1152 @@
                     goto on_error;
                 }
+                w->cap_started = PJ_TRUE;
             }
 
@@ -2258 +2259 @@
 
     if (enable) {
-        /* Start stream in encoding direction */
+        pjsua_vid_win *w;
+        pjsua_vid_win_id wid;
+
+        wid = vid_preview_get_win(call_med->strm.v.cap_dev, PJ_FALSE);
+        pj_assert(wid != PJSUA_INVALID_ID);
+
+        w = &pjsua_var.win[wid];
+
+        if (!w->cap_started) {
+            /* Start the video capture first */
+            status = pjmedia_vid_port_start(w->vp_cap);
+            if (status != PJ_SUCCESS)
+                return status;
+            w->cap_started = PJ_TRUE;
+        }
+        
+        /* Resume stream in encoding direction */
         status = pjmedia_vid_stream_resume(call_med->strm.v.stream,
                                            PJMEDIA_DIR_ENCODING);