Changeset 5140 for pjproject/trunk

Timestamp:

Jul 31, 2015 7:12:36 AM (9 years ago)

Author:

nanang

Message:

Fix #1871: fixed missing audio index normalization in audio device open functions.

Location:

pjproject/trunk/pjmedia/src/pjmedia

Files:

• sound_legacy.c (modified) (1 diff)
• sound_port.c (modified) (3 diffs)

pjproject/trunk/pjmedia/src/pjmedia/sound_legacy.c

@@ -125 +125 @@
     pj_status_t status;
 
+    /* Normalize rec_id & play_id */
+    if (dir & PJMEDIA_DIR_CAPTURE && rec_id < 0)
+        rec_id = PJMEDIA_AUD_DEFAULT_CAPTURE_DEV;
+    if (dir & PJMEDIA_DIR_PLAYBACK && play_id < 0)
+        play_id = PJMEDIA_AUD_DEFAULT_PLAYBACK_DEV;
+
     /* Initialize parameters */
     if (dir & PJMEDIA_DIR_CAPTURE) {

pjproject/trunk/pjmedia/src/pjmedia/sound_port.c

@@ -378 +378 @@
     pjmedia_snd_port_param_default(&param);
 
+    /* Normalize rec_id & play_id */
+    if (rec_id < 0)
+        rec_id = PJMEDIA_AUD_DEFAULT_CAPTURE_DEV;
+    if (play_id < 0)
+        play_id = PJMEDIA_AUD_DEFAULT_PLAYBACK_DEV;
+
     status = pjmedia_aud_dev_default_param(rec_id, &param.base);
     if (status != PJ_SUCCESS)
@@ -412 +418 @@
     pjmedia_snd_port_param_default(&param);
 
+    /* Normalize dev_id */
+    if (dev_id < 0)
+        dev_id = PJMEDIA_AUD_DEFAULT_CAPTURE_DEV;
+
     status = pjmedia_aud_dev_default_param(dev_id, &param.base);
     if (status != PJ_SUCCESS)
@@ -445 +455 @@
 
     pjmedia_snd_port_param_default(&param);
+
+    /* Normalize dev_id */
+    if (dev_id < 0)
+        dev_id = PJMEDIA_AUD_DEFAULT_PLAYBACK_DEV;
 
     status = pjmedia_aud_dev_default_param(dev_id, &param.base);