Changeset 5012 for pjproject/trunk/pjmedia/src/pjmedia/vid_port.c

Timestamp:

Mar 22, 2015 7:50:28 AM (9 years ago)

Author:

ming

Message:

Fixed #1827: Video port's clock thread may get stuck during format change event

File:

• pjproject/trunk/pjmedia/src/pjmedia/vid_port.c (modified) (2 diffs)

pjproject/trunk/pjmedia/src/pjmedia/vid_port.c

@@ -581 +581 @@
         pj_status_t status;
         
-        pjmedia_vid_port_stop(vp);
+        /* Ticket #1827:
+         * Stopping video port should not be necessary here because
+         * it will also try to stop the clock, from inside the clock's
+         * own thread, so it may get stuck. We just stop the video device
+         * stream instead.
+         * pjmedia_vid_port_stop(vp);
+         */
+        pjmedia_vid_dev_stream_stop(vp->strm);
         
         /* Retrieve the video format detail */
@@ -636 +643 @@
         }
         
-        pjmedia_vid_port_start(vp);
+        /* pjmedia_vid_port_start(vp); */
+        pjmedia_vid_dev_stream_start(vp->strm);
     }