Changeset 1823 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

Timestamp:

Feb 26, 2008 3:32:16 PM (16 years ago)

Author:

bennylp

Message:

Ticket #495: ability to specify different clock rate when opening sound device

File:

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

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

@@ -1772 +1772 @@
     pjmedia_port *conf_port;
     const pjmedia_snd_dev_info *play_info;
-    unsigned clock_rates[] = { 0, 22050, 44100, 48000, 11025, 32000, 8000};
+    unsigned clock_rates[] = {0, 22050, 44100, 48000, 32000, 16000, 
+                              8000};
     unsigned selected_clock_rate = 0;
     unsigned i;
@@ -1785 +1786 @@
 
     /* Set default clock rate */
-    clock_rates[0] = pjsua_var.media_cfg.clock_rate;
+    clock_rates[0] = pjsua_var.media_cfg.snd_clock_rate;
+    if (clock_rates[0] == 0)
+        clock_rates[0] = pjsua_var.media_cfg.clock_rate;
 
     /* Attempts to open the sound device with different clock rates */
@@ -1832 +1835 @@
     if (selected_clock_rate != pjsua_var.media_cfg.clock_rate) {
         pjmedia_port *resample_port;
-
+        unsigned resample_opt = 0;
+
+        if (pjsua_var.media_cfg.quality >= 3 &&
+            pjsua_var.media_cfg.quality <= 4)
+        {
+            resample_opt |= PJMEDIA_CONF_SMALL_FILTER;
+        }
+        else if (pjsua_var.media_cfg.quality < 3) {
+            resample_opt |= PJMEDIA_CONF_USE_LINEAR;
+        }
+        
         status = pjmedia_resample_port_create(pjsua_var.pool, conf_port, 
-                                              selected_clock_rate, 0, 
-                                              &resample_port);
+                                              selected_clock_rate, 
+                                              resample_opt, &resample_port);
         if (status != PJ_SUCCESS) {
             pjsua_perror("Error creating resample port", THIS_FILE, status);
@@ -1864 +1877 @@
     play_info = pjmedia_snd_get_dev_info(si.rec_id);
 
-    pjmedia_conf_set_port0_name(pjsua_var.mconf, 
-                                pj_cstr(&tmp, play_info->name));
+    if (si.clock_rate != pjsua_var.media_cfg.clock_rate) {
+        char tmp_buf[128];
+        int tmp_buf_len = sizeof(tmp_buf);
+
+        tmp_buf_len = pj_ansi_snprintf(tmp_buf, sizeof(tmp_buf)-1, "%s (%dKHz)",
+                                       play_info->name, si.clock_rate/1000);
+        pj_strset(&tmp, tmp_buf, tmp_buf_len);
+        pjmedia_conf_set_port0_name(pjsua_var.mconf, &tmp); 
+    } else {
+        pjmedia_conf_set_port0_name(pjsua_var.mconf, 
+                                    pj_cstr(&tmp, play_info->name));
+    }
 
     return PJ_SUCCESS;