Changeset 3893 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_vid.c

Timestamp:

Dec 1, 2011 10:49:07 AM (13 years ago)

Author:

ming

Message:

Closed #1420: Add support for event manager

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_vid.c (modified) (12 diffs)

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

@@ -58 +58 @@
     }
 
+    status = pjmedia_event_mgr_create(pjsua_var.pool, 0, NULL);
+    if (status != PJ_SUCCESS) {
+        PJ_PERROR(1,(THIS_FILE, status,
+                     "Error creating PJMEDIA event manager"));
+        goto on_error;
+    }
+
     status = pjmedia_vid_codec_mgr_create(pjsua_var.pool, NULL);
     if (status != PJ_SUCCESS) {
@@ -130 +137 @@
     if (pjmedia_converter_mgr_instance())
         pjmedia_converter_mgr_destroy(NULL);
+
+    if (pjmedia_event_mgr_instance())
+        pjmedia_event_mgr_destroy(NULL);
 
     if (pjmedia_video_format_mgr_instance())
@@ -614 +624 @@
 
     if (w->vp_cap) {
+        pjmedia_event_unsubscribe(NULL, &call_media_on_event, NULL,
+                                  w->vp_cap);
         pjmedia_vid_port_stop(w->vp_cap);
         pjmedia_vid_port_disconnect(w->vp_cap);
@@ -619 +631 @@
     }
     if (w->vp_rend) {
+        pjmedia_event_unsubscribe(NULL, &call_media_on_event, NULL,
+                                  w->vp_rend);
         pjmedia_vid_port_stop(w->vp_rend);
         pjmedia_vid_port_destroy(w->vp_rend);
@@ -816 +830 @@
 #if ENABLE_EVENT
             /* Register to video events */
-            pjmedia_event_subscribe(
-                    pjmedia_vid_port_get_event_publisher(w->vp_rend),
-                    &call_med->esub_rend);
+            pjmedia_event_subscribe(NULL, w->pool, &call_media_on_event,
+                                    call_med, w->vp_rend);
 #endif
             
@@ -887 +900 @@
             w = &pjsua_var.win[wid];
 #if ENABLE_EVENT
-            pjmedia_event_subscribe(
-                    pjmedia_vid_port_get_event_publisher(w->vp_cap),
-                    &call_med->esub_cap);
+            pjmedia_event_subscribe(NULL, w->pool, &call_media_on_event,
+                                    call_med, w->vp_cap);
 #endif
             
@@ -1007 +1019 @@
 
         /* Unsubscribe event */
-        pjmedia_event_unsubscribe(&call_med->esub_cap);
+        pjmedia_event_unsubscribe(NULL, &call_media_on_event, call_med,
+                                  w->vp_cap);
 
         /* Re-start capture again, if it is used by other stream */
@@ -1022 +1035 @@
         /* Stop the render before unsubscribing event */
         pjmedia_vid_port_stop(w->vp_rend);
-        pjmedia_event_unsubscribe(&call_med->esub_rend);
+        pjmedia_event_unsubscribe(NULL, &call_media_on_event, call_med,
+                                  w->vp_rend);
 
         dec_vid_win(call_med->strm.v.rdr_win_id);
@@ -1836 +1850 @@
         return status;
 
-    pjmedia_event_unsubscribe(&call_med->esub_cap);
+    pjmedia_event_unsubscribe(NULL, &call_media_on_event, call_med,
+                              w->vp_cap);
     
     /* temporarily disconnect while we operate on the tee. */
@@ -1894 +1909 @@
 
 #if ENABLE_EVENT
-    pjmedia_event_subscribe(
-            pjmedia_vid_port_get_event_publisher(new_w->vp_cap),
-            &call_med->esub_cap);
+    pjmedia_event_subscribe(NULL, new_w->pool, &call_media_on_event,
+                            call_med, new_w->vp_cap);
 #endif
 
@@ -1920 +1934 @@
     if (new_w) {
         /* Unsubscribe, just in case */
-        pjmedia_event_unsubscribe(&call_med->esub_cap);
+        pjmedia_event_unsubscribe(NULL, &call_media_on_event, call_med,
+                                  new_w->vp_cap);
         /* Disconnect media port from the new capturer */
         pjmedia_vid_tee_remove_dst_port(new_w->tee, media_port);
@@ -1936 +1951 @@
 #if ENABLE_EVENT
     /* Resubscribe */
-    pjmedia_event_subscribe(
-            pjmedia_vid_port_get_event_publisher(w->vp_cap),
-            &call_med->esub_cap);
+    pjmedia_event_subscribe(NULL, w->pool, &call_media_on_event,
+                            call_med, w->vp_cap);
 #endif