Changeset 5012

Timestamp:

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

Author:

ming

Message:

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

Location:

pjproject/trunk

Files:

• pjlib/include/pj/os.h (modified) (1 diff)
• pjlib/src/pj/os_core_unix.c (modified) (1 diff)
• pjmedia/src/pjmedia/vid_port.c (modified) (2 diffs)

pjproject/trunk/pjlib/include/pj/os.h

@@ -312 +312 @@
 /**
  * Join thread, and block the caller thread until the specified thread exits.
+ * If it is called from within the thread itself, it will return immediately
+ * with failure status.
  * If the specified thread has already been dead, or it does not exist,
- * the function will return immediately with successfull status.
+ * the function will return immediately with successful status.
  *
  * @param thread    The thread handle.

pjproject/trunk/pjlib/src/pj/os_core_unix.c

@@ -717 +717 @@
 
     PJ_CHECK_STACK();
+
+    if (p == pj_thread_this())
+        return PJ_ECANCELLED;
 
     PJ_LOG(6, (pj_thread_this()->obj_name, "Joining thread %s", p->obj_name));

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);
     }