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

Timestamp:

Aug 21, 2008 3:04:20 PM (16 years ago)

Author:

nanang

Message:

Fixed pjsua-lib bug that it failed to connect sound device & conference for some audio_frame_ptime settings (thanks Thomas Ramp).

File:

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

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

@@ -2128 +2128 @@
     for (i=0; i<PJ_ARRAY_SIZE(clock_rates); ++i) {
         char errmsg[PJ_ERR_MSG_SIZE];
-        unsigned fps;
+        unsigned samples_per_frame;
 
         PJ_LOG(4,(THIS_FILE, 
@@ -2134 +2134 @@
                   "@%d Hz", clock_rates[i]));
 
+        samples_per_frame = clock_rates[i] *
+                            pjsua_var.media_cfg.audio_frame_ptime *
+                            pjsua_var.media_cfg.channel_count / 1000;
+
         /* Create the sound device. Sound port will start immediately. */
-        fps = 1000 / pjsua_var.media_cfg.audio_frame_ptime;
         status = pjmedia_snd_port_create(pjsua_var.snd_pool, capture_dev,
                                          playback_dev, 
                                          clock_rates[i], 
                                          pjsua_var.media_cfg.channel_count,
-                                         clock_rates[i]/fps * 
-                                         pjsua_var.media_cfg.channel_count,
+                                         samples_per_frame,
                                          16, 0, &pjsua_var.snd_port);