Changeset 1833 for pjproject/trunk/pjmedia/src/pjmedia/sound_port.c

Timestamp:

Feb 29, 2008 5:19:42 PM (11 years ago)

Author:

bennylp

Message:

Ticket #438: Workaround for frame bursts from audio devices: added wsola in delaybuf, and put delaybuf in the bridge

File:

• pjproject/trunk/pjmedia/src/pjmedia/sound_port.c (modified) (3 diffs)

pjproject/trunk/pjmedia/src/pjmedia/sound_port.c

@@ -33 +33 @@
 #define THIS_FILE           "sound_port.c"
 
+#define TEST_OVERFLOW_UNDERFLOW
+
 enum
 {
@@ -102 +104 @@
     if (snd_port->delay_buf) {
         status = pjmedia_delay_buf_get(snd_port->delay_buf, (pj_int16_t*)output);
-        if (status != PJ_SUCCESS) {
+        if (status != PJ_SUCCESS)
             pj_bzero(output, size);
-        }
 
         frame.type = PJMEDIA_FRAME_TYPE_AUDIO;
         pjmedia_port_put_frame(port, &frame);
+
+#ifdef TEST_OVERFLOW_UNDERFLOW
+        {
+            static int count = 1;
+            if (++count % 10 == 0) {
+                status = pjmedia_delay_buf_get(snd_port->delay_buf, 
+                                               (pj_int16_t*)output);
+                if (status != PJ_SUCCESS)
+                    pj_bzero(output, size);
+
+                frame.type = PJMEDIA_FRAME_TYPE_AUDIO;
+                pjmedia_port_put_frame(port, &frame);
+            }
+        }
+#endif
+
     }
 #endif
@@ -372 +389 @@
     
 #if PJMEDIA_SOUND_USE_DELAYBUF
-    status = pjmedia_delay_buf_create(pool, "snd_buff", samples_per_frame, 
+    status = pjmedia_delay_buf_create(pool, "snd_buff", 
+                                      clock_rate, samples_per_frame, 
                                       PJMEDIA_SOUND_BUFFER_COUNT, -1, 
                                       &snd_port->delay_buf);