[xiph-commits] r11334 - in trunk/speex: include/speex libspeex

[jm at svn.xiph.org]

Author: jm
Date: 2006-05-03 09:39:50 -0700 (Wed, 03 May 2006)
New Revision: 11334

Modified:
   trunk/speex/include/speex/speex_jitter.h
   trunk/speex/libspeex/jitter.c
Log:
reverted to original SpeexJitter API


Modified: trunk/speex/include/speex/speex_jitter.h
===================================================================
--- trunk/speex/include/speex/speex_jitter.h	2006-05-02 15:21:08 UTC (rev 11333)
+++ trunk/speex/include/speex/speex_jitter.h	2006-05-03 16:39:50 UTC (rev 11334)
@@ -101,7 +101,7 @@
 void speex_jitter_destroy(SpeexJitter *jitter);
 
 /** Put one packet into the jitter buffer */
-void speex_jitter_put(SpeexJitter *jitter, const JitterBufferPacket *packet);
+void speex_jitter_put(SpeexJitter *jitter, char *packet, int len, int timestamp);
 
 /** Get one packet from the jitter buffer */
 void speex_jitter_get(SpeexJitter *jitter, spx_int16_t *out, int *start_offset);

Modified: trunk/speex/libspeex/jitter.c
===================================================================
--- trunk/speex/libspeex/jitter.c	2006-05-02 15:21:08 UTC (rev 11333)
+++ trunk/speex/libspeex/jitter.c	2006-05-03 16:39:50 UTC (rev 11334)
@@ -446,10 +446,14 @@
    speex_bits_destroy(&jitter->current_packet);
 }
 
-
-void speex_jitter_put(SpeexJitter *jitter, const JitterBufferPacket *packet)
+void speex_jitter_put(SpeexJitter *jitter, char *packet, int len, int timestamp)
 {
-   jitter_buffer_put(jitter->packets, packet);
+   JitterBufferPacket p;
+   p.data = packet;
+   p.len = len;
+   p.timestamp = timestamp;
+   p.span = jitter->frame_size;
+   jitter_buffer_put(jitter->packets, &p);
 }
 
 void speex_jitter_get(SpeexJitter *jitter, short *out, int *current_timestamp)