Changeset 3656

Timestamp:

Jul 15, 2011 7:27:05 AM (13 years ago)

Author:

bennylp

Message:

Fixed #1265: video events for PJSUA-LIB

Location:

pjproject/branches/projects/2.0-dev/pjsip

Files:

• include/pjsua-lib/pjsua_internal.h (modified) (1 diff)
• src/pjsua-lib/pjsua_media.c (modified) (1 diff)
• src/pjsua-lib/pjsua_vid.c (modified) (5 diffs)

pjproject/branches/projects/2.0-dev/pjsip/include/pjsua-lib/pjsua_internal.h

@@ -100 +100 @@
     pjmedia_srtp_use     rem_srtp_use; /**< Remote's SRTP usage policy.     */
 
-    pjmedia_event_subscription esub;/**< To subscribe to media events.      */
+    pjmedia_event_subscription esub_rend;/**< Subscribe renderer events.     */
+    pjmedia_event_subscription esub_cap;/**< Subscribe capture events.      */
 } pjsua_call_media;
 

pjproject/branches/projects/2.0-dev/pjsip/src/pjsua-lib/pjsua_media.c

@@ -1427 +1427 @@
 #endif
 
-    pjmedia_event_subscription_init(&call_med->esub, &call_media_on_event,
+    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);
 
     return PJ_SUCCESS;

pjproject/branches/projects/2.0-dev/pjsip/src/pjsua-lib/pjsua_vid.c

@@ -632 +632 @@
                 return status;
 
+            w = &pjsua_var.win[wid];
+
             /* Register to video events */
             pjmedia_event_subscribe(
                     pjmedia_vid_port_get_event_publisher(w->vp_rend),
-                    &call_med->esub);
-
-            w = &pjsua_var.win[wid];
+                    &call_med->esub_rend);
             
             /* Connect renderer to stream */
@@ -680 +680 @@
 
             w = &pjsua_var.win[wid];
+
+            pjmedia_event_subscribe(
+                    pjmedia_vid_port_get_event_publisher(w->vp_cap),
+                    &call_med->esub_cap);
             
             /* Connect stream to capturer (via video window tee) */
@@ -769 +773 @@
         return;
 
+    /* Unsubscribe events */
+    pjmedia_event_unsubscribe(&call_med->esub_rend);
+    pjmedia_event_unsubscribe(&call_med->esub_cap);
+
     if (call_med->strm.v.cap_win_id != PJSUA_INVALID_ID) {
         pjmedia_port *media_port;
@@ -1355 +1363 @@
     if (status != PJ_SUCCESS)
         return status;
+
+    pjmedia_event_unsubscribe(&call_med->esub_cap);
     
     /* = Detach stream port from the old capture device = */
@@ -1392 +1402 @@
     if (status != PJ_SUCCESS)
         return status;
+
+    pjmedia_event_subscribe(
+            pjmedia_vid_port_get_event_publisher(w->vp_rend),
+            &call_med->esub_cap);
 
     /* Start renderer */