Changeset 3778 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.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/pjsip/src/pjsua-lib/pjsua_media.c (modified) (2 diffs)

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

@@ -1340 +1340 @@
 #endif
 
-    pjmedia_event_subscription_init(&call_med->esub_rend, &call_media_on_event,
-                                    call_med);
-    pjmedia_event_subscription_init(&call_med->esub_cap, &call_media_on_event,
-                                    call_med);
-
 on_error:
     if (status != PJ_SUCCESS && call_med->tp) {
@@ -1403 +1398 @@
                 call_med->strm.v.cap_dev = info.id;
             }
+
+            /* Init event subscribtion */
+            pjmedia_event_subscription_init(&call_med->esub_rend, &call_media_on_event,
+                                            call_med);
+            pjmedia_event_subscription_init(&call_med->esub_cap, &call_media_on_event,
+                                            call_med);
         }
 #endif