Changeset 2742 for pjproject/trunk

Timestamp:

Jun 3, 2009 6:59:37 PM (15 years ago)

Author:

bennylp

Message:

More ticket #876:

• fixed crash when null-audio is used with switchboard

Location:

pjproject/trunk

Files:

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

pjproject/trunk/pjmedia/src/pjmedia-audiodev/audiodev.c

@@ -598 +598 @@
     PJ_ASSERT_RETURN(prm && prm->dir && p_aud_strm, PJ_EINVAL);
     PJ_ASSERT_RETURN(aud_subsys.pf, PJMEDIA_EAUD_INIT);
+    PJ_ASSERT_RETURN(prm->dir==PJMEDIA_DIR_CAPTURE ||
+                     prm->dir==PJMEDIA_DIR_PLAYBACK ||
+                     prm->dir==PJMEDIA_DIR_CAPTURE_PLAYBACK,
+                     PJ_EINVAL);
 
     /* Must make copy of param because we're changing device ID */
@@ -631 +635 @@
         f = play_f;
     }
+
+    PJ_ASSERT_RETURN(f != NULL, PJ_EBUG);
 
     /* For now, rec_id and play_id must belong to the same factory */

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

@@ -1721 +1721 @@
 
         if (need_reopen) {
-            pjmedia_aud_param param;
-
-            /* Create parameter based on peer info */
-            status = create_aud_param(&param, pjsua_var.cap_dev, 
-                                      pjsua_var.play_dev,
-                                      peer_info.clock_rate,
-                                      peer_info.channel_count,
-                                      peer_info.samples_per_frame,
-                                      peer_info.bits_per_sample);
-
-            /* And peer format */
-            if (peer_info.format.id != PJMEDIA_FORMAT_PCM) {
-                param.flags |= PJMEDIA_AUD_DEV_CAP_EXT_FORMAT;
-                param.ext_fmt = peer_info.format;
-            }
-
-            status = open_snd_dev(&param);
-            if (status != PJ_SUCCESS) {
-                pjsua_perror(THIS_FILE, "Error opening sound device", status);
-                return status;
+            if (pjsua_var.cap_dev != NULL_SND_DEV_ID) {
+                pjmedia_aud_param param;
+
+                /* Create parameter based on peer info */
+                status = create_aud_param(&param, pjsua_var.cap_dev, 
+                                          pjsua_var.play_dev,
+                                          peer_info.clock_rate,
+                                          peer_info.channel_count,
+                                          peer_info.samples_per_frame,
+                                          peer_info.bits_per_sample);
+                if (status != PJ_SUCCESS) {
+                    pjsua_perror(THIS_FILE, "Error opening sound device", status);
+                    return status;
+                }
+
+                /* And peer format */
+                if (peer_info.format.id != PJMEDIA_FORMAT_PCM) {
+                    param.flags |= PJMEDIA_AUD_DEV_CAP_EXT_FORMAT;
+                    param.ext_fmt = peer_info.format;
+                }
+
+                status = open_snd_dev(&param);
+                if (status != PJ_SUCCESS) {
+                    pjsua_perror(THIS_FILE, "Error opening sound device", status);
+                    return status;
+                }
+            } else {
+                /* Null-audio */
+                status = pjsua_set_snd_dev(pjsua_var.cap_dev, pjsua_var.play_dev);
+                if (status != PJ_SUCCESS) {
+                    pjsua_perror(THIS_FILE, "Error opening sound device", status);
+                    return status;
+                }
             }
         }