Changeset 5955 for pjproject

Timestamp:

Mar 20, 2019 3:23:34 AM (6 years ago)

Author:

nanang

Message:

Fix #2184: PJSUA2 cannot switch from null audio device.

File:

• pjproject/trunk/pjsip/src/pjsua2/media.cpp (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsua2/media.cpp

@@ -697 +697 @@
     param.capture_dev = capture_dev;
     param.playback_dev = getPlaybackDev();
-    if (param.playback_dev == PJMEDIA_AUD_INVALID_DEV)
+    
+    /* Normalize invalid ID or null device to default device */
+    if (param.playback_dev == PJMEDIA_AUD_INVALID_DEV ||
+        param.playback_dev == PJSUA_SND_NULL_DEV)
+    {
         param.playback_dev = PJMEDIA_AUD_DEFAULT_PLAYBACK_DEV;
+    }
 
     param.mode = PJSUA_SND_DEV_NO_IMMEDIATE_OPEN;    
@@ -710 +715 @@
     pjsua_snd_dev_param_default(&param);    
 
+    param.playback_dev = playback_dev;
     param.capture_dev = getCaptureDev();
-    if (param.capture_dev == PJMEDIA_AUD_INVALID_DEV)
+
+    /* Normalize invalid ID or null device to default device */
+    if (param.capture_dev == PJMEDIA_AUD_INVALID_DEV ||
+        param.capture_dev == PJSUA_SND_NULL_DEV)
+    {
         param.capture_dev = PJMEDIA_AUD_DEFAULT_CAPTURE_DEV;
-    param.playback_dev = playback_dev;
+    }
 
     param.mode = PJSUA_SND_DEV_NO_IMMEDIATE_OPEN;