Changeset 5571 for pjproject

Timestamp:

Mar 24, 2017 3:00:47 AM (7 years ago)

Author:

ming

Message:

Fixed #2005: Crash when hanging up call if video capture device fails to open

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia/vid_port.c (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia/vid_port.c

@@ -505 +505 @@
     PJ_ASSERT_RETURN(vfd->fps.num, PJ_EINVAL);
 
+    /* Get device info */
+    if (prm->vidparam.dir & PJMEDIA_DIR_CAPTURE)
+        status = pjmedia_vid_dev_get_info(prm->vidparam.cap_id, &di);
+    else
+        status = pjmedia_vid_dev_get_info(prm->vidparam.rend_id, &di);
+    if (status != PJ_SUCCESS)
+        return status;
+
     /* Allocate videoport */
     vp = PJ_POOL_ZALLOC_T(pool, pjmedia_vid_port);
@@ -514 +522 @@
     vparam = prm->vidparam;
     dev_name[0] = '\0';
-
-    /* Get device info */
-    if (vp->dir & PJMEDIA_DIR_CAPTURE)
-        status = pjmedia_vid_dev_get_info(prm->vidparam.cap_id, &di);
-    else
-        status = pjmedia_vid_dev_get_info(prm->vidparam.rend_id, &di);
-    if (status != PJ_SUCCESS)
-        return status;
 
     pj_ansi_snprintf(dev_name, sizeof(dev_name), "%s [%s]",

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

@@ -2550 +2550 @@
 static void stop_media_stream(pjsua_call *call, unsigned med_idx)
 {
-    pjsua_call_media *call_med = &call->media[med_idx];
-
-    /* Check if stream does not exist */
-    if (med_idx >= call->med_cnt)
-        return;
+    pjsua_call_media *call_med;
+    
+    if (pjsua_call_media_is_changing(call)) {
+        call_med = &call->media_prov[med_idx];
+        if (med_idx >= call->med_prov_cnt)
+            return;
+    } else {
+        call_med = &call->media[med_idx];
+        if (med_idx >= call->med_cnt)
+            return;
+    }
 
     pj_log_push_indent();