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

Timestamp:

Jan 4, 2008 6:19:40 PM (16 years ago)

Author:

bennylp

Message:

Ticket #438 (Workaround for frame bursts from audio devices): added delay buffer implementation in pjmedia

File:

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

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

@@ -18 +18 @@
  */
 #include <pjmedia/sound_port.h>
+#include <pjmedia/delaybuf.h>
 #include <pjmedia/echo.h>
 #include <pjmedia/errno.h>
@@ -63 +64 @@
     unsigned             samples_per_frame;
     unsigned             bits_per_sample;
+
+#if PJMEDIA_SOUND_USE_DELAYBUF
+    pjmedia_delay_buf   *delay_buf;
+#endif
 };
 
@@ -93 +98 @@
     frame.timestamp.u32.hi = 0;
     frame.timestamp.u32.lo = timestamp;
+
+#if PJMEDIA_SOUND_USE_DELAYBUF
+    status = pjmedia_delay_buf_get(snd_port->delay_buf, (pj_int16_t*)output);
+    if (status != PJ_SUCCESS) {
+        pj_bzero(output, size);
+    }
+
+    pjmedia_port_put_frame(port, &frame);
+#endif
 
     status = pjmedia_port_get_frame(port, &frame);
@@ -186 +200 @@
     }
 
+#if PJMEDIA_SOUND_USE_DELAYBUF
+    PJ_UNUSED_ARG(size);
+    PJ_UNUSED_ARG(timestamp);
+    PJ_UNUSED_ARG(frame);
+    pjmedia_delay_buf_put(snd_port->delay_buf, (pj_int16_t*)input);
+#else
     frame.buf = (void*)input;
     frame.size = size;
@@ -192 +212 @@
 
     pjmedia_port_put_frame(port, &frame);
+#endif
 
     return PJ_SUCCESS;
@@ -325 +346 @@
 {
     pjmedia_snd_port *snd_port;
+    pj_status_t status;
 
     PJ_ASSERT_RETURN(pool && p_port, PJ_EINVAL);
@@ -339 +361 @@
     snd_port->samples_per_frame = samples_per_frame;
     snd_port->bits_per_sample = bits_per_sample;
+    
+#if PJMEDIA_SOUND_USE_DELAYBUF
+    status = pjmedia_delay_buf_create(pool, "snd_buff", samples_per_frame, 
+                                      16, &snd_port->delay_buf);
+    PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
+#else
+    PJ_UNUSED_ARG(status);
+#endif
 
     *p_port = snd_port;