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

Timestamp:

Oct 11, 2006 9:56:16 PM (18 years ago)

Author:

bennylp

Message:

Fixed bug in pjsua_media.c: when sound device is created with different sampling rate than the clock rate configuration, resampling port needs to be created.

File:

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

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

@@ -971 +971 @@
     const pjmedia_snd_dev_info *cap_info, *play_info;
     unsigned clock_rates[] = { 0, 22050, 44100, 48000, 11025, 32000, 8000};
+    unsigned selected_clock_rate = 0;
     unsigned i;
     pj_status_t status = -1;
@@ -999 +1000 @@
                                          16, 0, &pjsua_var.snd_port);
 
-        if (status == PJ_SUCCESS)
+        if (status == PJ_SUCCESS) {
+            selected_clock_rate = clock_rates[i];
             break;
+        }
 
         pj_strerror(status, errmsg, sizeof(errmsg));
-        PJ_LOG(4, ("..failed: %s", errmsg));
+        PJ_LOG(4, (THIS_FILE, "..failed: %s", errmsg));
     }
 
@@ -1019 +1022 @@
                              pjsua_var.media_cfg.ec_tail_len, 
                              pjsua_var.media_cfg.ec_options);
+
+    /* If there's mismatch between sound port and conference's port,
+     * create a resample port to bridge them.
+     */
+    if (selected_clock_rate != pjsua_var.media_cfg.clock_rate) {
+        pjmedia_port *resample_port;
+
+        status = pjmedia_resample_port_create(pjsua_var.pool, conf_port, 
+                                              selected_clock_rate, 0, 
+                                              &resample_port);
+        if (status != PJ_SUCCESS) {
+            pjsua_perror("Error creating resample port", THIS_FILE, status);
+            return status;
+        }
+
+        conf_port = resample_port;
+    }
 
     /* Connect sound port to the bridge */