Changeset 3772

Timestamp:

Sep 23, 2011 4:00:27 AM (13 years ago)

Author:

nanang

Message:

Closes #1377: fixed video stream cleanup to reset back cap_win_id & rdr_win_id value to PJSUA_INVALID_ID after capture/render device released from the call stream.

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_vid.c (modified) (1 diff)

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

@@ -980 +980 @@
         pjsua_vid_win *w =
                     &pjsua_var.win[call_med->strm.v.cap_win_id];
-
-        pjmedia_vid_stream_get_port(call_med->strm.v.stream,
-                                    PJMEDIA_DIR_ENCODING,
-                                    &media_port);
-        pj_assert(media_port);
-
-        pjmedia_vid_port_stop(w->vp_cap);
-        pjmedia_vid_tee_remove_dst_port(w->tee, media_port);
-        pjmedia_vid_port_start(w->vp_cap);
+        pj_status_t status;
+
+        /* Disconnect video stream from capture device */
+        status = pjmedia_vid_stream_get_port(call_med->strm.v.stream,
+                                             PJMEDIA_DIR_ENCODING,
+                                             &media_port);
+        if (status == PJ_SUCCESS) {
+            /* Video tee is not threadsafe, so stop the capture first */
+            pjmedia_vid_port_stop(w->vp_cap);
+            pjmedia_vid_tee_remove_dst_port(w->tee, media_port);
+            pjmedia_vid_port_start(w->vp_cap);
+        }
 
         dec_vid_win(call_med->strm.v.cap_win_id);
+        call_med->strm.v.cap_win_id = PJSUA_INVALID_ID;
     }
 
     if (call_med->strm.v.rdr_win_id != PJSUA_INVALID_ID) {
         dec_vid_win(call_med->strm.v.rdr_win_id);
+        call_med->strm.v.rdr_win_id = PJSUA_INVALID_ID;
     }