Changeset 4084

Timestamp:

Apr 25, 2012 7:13:05 AM (13 years ago)

Author:

ming

Message:

Re #1446 (misc): Fix possible crash if video ports are destroyed in the wrong order (i.e. client port must be destroyed last).

Location:

pjproject/trunk

Files:

• pjmedia/src/test/vid_codec_test.c (modified) (1 diff)
• pjmedia/src/test/vid_dev_test.c (modified) (1 diff)
• pjmedia/src/test/vid_port_test.c (modified) (1 diff)
• pjsip-apps/src/samples/vid_streamutil.c (modified) (1 diff)

pjproject/trunk/pjmedia/src/test/vid_codec_test.c

@@ -418 +418 @@
         PJ_PERROR(3, (THIS_FILE, status, "  error"));
     }
-    if (capture) {
+    if (capture)
         pjmedia_vid_port_stop(capture);
+    if (renderer)
+        pjmedia_vid_port_stop(renderer);
+    if (capture)
         pjmedia_vid_port_destroy(capture);
-    }
-    if (renderer) {
-        pjmedia_vid_port_stop(renderer);
+    if (renderer)
         pjmedia_vid_port_destroy(renderer);
-    }
     if (codec) {
         pjmedia_event_unsubscribe(NULL, &codec_on_event, &codec_port_data,

pjproject/trunk/pjmedia/src/test/vid_dev_test.c

@@ -192 +192 @@
 
     if (capture)
+        pjmedia_vid_port_stop(capture);
+    if (renderer)
+        pjmedia_vid_port_stop(renderer);
+    if (capture)
         pjmedia_vid_port_destroy(capture);
     if (renderer) {

pjproject/trunk/pjmedia/src/test/vid_port_test.c

@@ -149 +149 @@
 
     if (capture)
+        pjmedia_vid_port_stop(capture);
+    if (renderer)
+        pjmedia_vid_port_stop(renderer);
+    if (capture)
         pjmedia_vid_port_destroy(capture);
     if (renderer) {

pjproject/trunk/pjsip-apps/src/samples/vid_streamutil.c

@@ -892 +892 @@
 on_exit:
 
+    /* Stop video devices */
+    if (capture)
+        pjmedia_vid_port_stop(capture);
+    if (renderer)
+        pjmedia_vid_port_stop(renderer);
+
     /* Stop and destroy file clock */
     if (play_clock) {