Changeset 3887 for pjproject/trunk

Timestamp:

Nov 17, 2011 2:25:26 PM (13 years ago)

Author:

bennylp

Message:

Missing video component deinitialization caused assertion when the stack is restarted. Thanks Régis Montoya for the report (re #1393)

File:

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

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

@@ -65 +65 @@
     }
 
-    status = pjmedia_vid_dev_subsys_init(&pjsua_var.cp.factory);
-    if (status != PJ_SUCCESS) {
-        PJ_PERROR(1,(THIS_FILE, status,
-                     "Error creating PJMEDIA video subsystem"));
-        goto on_error;
-    }
-
 #if PJMEDIA_HAS_VIDEO && PJMEDIA_HAS_FFMPEG_CODEC
     status = pjmedia_codec_ffmpeg_init(NULL, &pjsua_var.cp.factory);
@@ -80 +73 @@
     }
 #endif
+
+    status = pjmedia_vid_dev_subsys_init(&pjsua_var.cp.factory);
+    if (status != PJ_SUCCESS) {
+        PJ_PERROR(1,(THIS_FILE, status,
+                     "Error creating PJMEDIA video subsystem"));
+        goto on_error;
+    }
 
     for (i=0; i<PJSUA_MAX_VID_WINS; ++i) {
@@ -122 +122 @@
 
 #if PJMEDIA_HAS_FFMPEG_CODEC
-            pjmedia_codec_ffmpeg_deinit();
+    pjmedia_codec_ffmpeg_deinit();
 #endif
+
+    if (pjmedia_vid_codec_mgr_instance())
+        pjmedia_vid_codec_mgr_destroy(NULL);
+
+    if (pjmedia_converter_mgr_instance())
+        pjmedia_converter_mgr_destroy(NULL);
+
+    if (pjmedia_video_format_mgr_instance())
+        pjmedia_video_format_mgr_destroy(NULL);
 
     pj_log_pop_indent();