Changeset 3778 for pjproject/trunk/pjmedia/src/pjmedia/event.c

Timestamp:

Oct 3, 2011 5:23:59 AM (13 years ago)

Author:

nanang

Message:

Fix #1358:

• Fixed wrong place of video capture & render event subscription initialization, causing it getting reinitted while being subscribed.
• Moved capture/render event unsubscription to be after capture/render port stopped. Also restart the capturer (after being stopped for unsubsciption & stream detachment) only when the capturer is being used by other, e.g: stream or preview.
• Fixed error handling in pjsua_call_reinvite(), call pjsip_dlg_dec_lock() only if dlg is successfully acquired.
• Minor: added [un]subscribtion log to event.

File:

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

pjproject/trunk/pjmedia/src/pjmedia/event.c

@@ -73 +73 @@
                                              pjmedia_event_subscription *esub)
 {
+    char epub_name[5];
+
     PJ_ASSERT_RETURN(epub && esub && esub->cb, PJ_EINVAL);
     /* Must not currently subscribe to anything */
     PJ_ASSERT_RETURN(esub->subscribe_to == NULL, PJ_EINVALIDOP);
+
+    TRACE_((THIS_FILE, "Subscription to publisher %s",
+                       pjmedia_fourcc_name(epub->sig, epub_name)));
 
     pj_list_push_back(&epub->subscription_list, esub);
@@ -85 +90 @@
 {
     PJ_ASSERT_RETURN(esub, PJ_EINVAL);
+
     if (esub->subscribe_to) {
+        char epub_name[5];
+        TRACE_((THIS_FILE, "Unsubscription to publisher %s",
+                           pjmedia_fourcc_name(esub->subscribe_to->sig,
+                                               epub_name)));
+
         PJ_ASSERT_RETURN(
             pj_list_find_node(&esub->subscribe_to->subscription_list,