Changeset 5842

Timestamp:

Jul 26, 2018 3:05:10 AM (6 years ago)

Author:

ming

Message:

Re #2126: re 5841: move the event manager creation and destruction in pjsua_media instead

Location:

pjproject/trunk/pjsip/src/pjsua-lib

Files:

• pjsua_aud.c (modified) (1 diff)
• pjsua_media.c (modified) (2 diffs)
• pjsua_vid.c (modified) (2 diffs)

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

@@ -237 +237 @@
     /* To suppress warning about unused var when all codecs are disabled */
     PJ_UNUSED_ARG(codec_id);
-
-    PJ_LOG(4,(THIS_FILE, "Initializing audio subsystem.."));
-
-    if (!pjmedia_event_mgr_instance()) {
-        status = pjmedia_event_mgr_create(pjsua_var.pool, 0, NULL);
-        if (status != PJ_SUCCESS) {
-            pjsua_perror(THIS_FILE, "Error creating PJMEDIA event manager",
-                         status);
-            goto on_error;
-        }
-    }
 
     /*

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

@@ -111 +111 @@
 #endif
 
-    /* Create event manager (if not yet, e.g: PJMEDIA_HAS_VIDEO==0) */
+    /* Create event manager */
     if (!pjmedia_event_mgr_instance()) {
         status = pjmedia_event_mgr_create(pjsua_var.pool, 
@@ -232 +232 @@
         //pjmedia_snd_deinit();
     }
+
+    if (pjmedia_event_mgr_instance())
+        pjmedia_event_mgr_destroy(NULL);
 
     pj_log_pop_indent();

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

@@ -62 +62 @@
     }
 
-    if (!pjmedia_event_mgr_instance()) {
-        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) {
@@ -169 +160 @@
     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())