Changeset 763 for pjproject

Timestamp:

Oct 11, 2006 4:03:41 PM (18 years ago)

Author:

bennylp

Message:

Changed pjsua_media.c to try different clock rates when opening sound device

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c (modified) (3 diffs)

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

@@ -45 +45 @@
 
     /* Normalize configuration */
-#if defined(PJ_DARWINOS) && PJ_DARWINOS!=0
-    pjsua_var.media_cfg.clock_rate = 44100;
-#endif
 
     if (pjsua_var.media_cfg.has_ioqueue &&
@@ -973 +970 @@
     pjmedia_port *conf_port;
     const pjmedia_snd_dev_info *cap_info, *play_info;
-    pj_status_t status;
+    unsigned clock_rates[] = { 0, 22050, 44100, 48000, 11025, 32000, 8000};
+    unsigned i;
+    pj_status_t status = -1;
 
     /* Close existing sound port */
@@ -982 +981 @@
     play_info = pjmedia_snd_get_dev_info(playback_dev);
 
-    PJ_LOG(4,(THIS_FILE, "Opening %s sound playback device and "
-                         "%s sound capture device..",
-                         play_info->name, cap_info->name));
-
-    /* Create the sound device. Sound port will start immediately. */
-    status = pjmedia_snd_port_create(pjsua_var.pool, capture_dev,
-                                     playback_dev, 
-                                     pjsua_var.media_cfg.clock_rate, 1,
-                                     pjsua_var.media_cfg.clock_rate/FPS,
-                                     16, 0, &pjsua_var.snd_port);
+    /* Set default clock rate */
+    clock_rates[0] = pjsua_var.media_cfg.clock_rate;
+
+    /* Attempts to open the sound device with different clock rates */
+    for (i=0; i<PJ_ARRAY_SIZE(clock_rates); ++i) {
+        char errmsg[PJ_ERR_MSG_SIZE];
+
+        PJ_LOG(4,(THIS_FILE, 
+                  "pjsua_set_snd_dev(): attempting to open devices "
+                  "@%d Hz", clock_rates[i]));
+
+        /* Create the sound device. Sound port will start immediately. */
+        status = pjmedia_snd_port_create(pjsua_var.pool, capture_dev,
+                                         playback_dev, 
+                                         clock_rates[i], 1,
+                                         clock_rates[i]/FPS,
+                                         16, 0, &pjsua_var.snd_port);
+
+        if (status == PJ_SUCCESS)
+            break;
+
+        pj_strerror(status, errmsg, sizeof(errmsg));
+        PJ_LOG(4, ("..failed: %s", errmsg));
+    }
+
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "Unable to open sound device", status);