Changeset 2454

Timestamp:

Feb 13, 2009 3:57:46 PM (16 years ago)

Author:

bennylp

Message:

Bug in APS-Direct emulation in sound_port causing crash and tick noise, and handle wideband audio in APS-Direct emulation in pjsua_app.c

Location:

pjproject/branches/projects/aps-direct

Files:

• pjmedia/src/pjmedia/sound_port.c (modified) (2 diffs)
• pjsip-apps/src/pjsua/pjsua_app.c (modified) (2 diffs)

pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia/sound_port.c

@@ -318 +318 @@
 
             subfrm = pjmedia_frame_ext_get_subframe(fx, i);         
+
+            if (!subfrm || subfrm->bitlen==0)
+                continue;
 
             if ((subfrm->bitlen>>3) > (int)(size-size_decoded)) {
@@ -721 +724 @@
     {
         snd_port->frm_buf_size = sizeof(pjmedia_frame_ext) + 
-                                 (samples_per_frame >> 1) +
+                                 (samples_per_frame << 1) +
                                  16 * sizeof(pjmedia_frame_ext_subframe);
         snd_port->put_frm_buf = (pj_uint8_t*)

pjproject/branches/projects/aps-direct/pjsip-apps/src/pjsua/pjsua_app.c

@@ -2465 +2465 @@
     /* Reset conference port attributes. */
     conf->info.samples_per_frame = samples_per_frame;
-    conf->info.clock_rate = 8000;
+    conf->info.clock_rate = strm_info->param->info.clock_rate;
     conf->info.channel_count = 1;
     conf->info.bits_per_sample = 16;
@@ -2474 +2474 @@
                                       -1,
                                       -1,
-                                      8000,
-                                      1,
+                                      strm_info->param->info.clock_rate,
+                                      strm_info->param->info.channel_cnt,
                                       samples_per_frame,
                                       16,