diff options
author | jm <jm@0101bb08-14d6-0310-b084-bc0e0c8e3800> | 2007-11-04 00:59:22 +0300 |
---|---|---|
committer | jm <jm@0101bb08-14d6-0310-b084-bc0e0c8e3800> | 2007-11-04 00:59:22 +0300 |
commit | 885d6b0199b297a5cb7bed8b032f563d2d3077da (patch) | |
tree | a2801cc3a5d86d7a2b7cb284a64f64efe53eb9ed /include/speex | |
parent | 8b7a8534453352f4e14f48208db9004c490d38bf (diff) |
jitter buffer: Cleaned up the remaining of the Speex-specific buffer and fixed
a bug in the timestamp adjustment when interpolating.
git-svn-id: http://svn.xiph.org/trunk/speex@14091 0101bb08-14d6-0310-b084-bc0e0c8e3800
Diffstat (limited to 'include/speex')
-rw-r--r-- | include/speex/speex_jitter.h | 40 |
1 files changed, 1 insertions, 39 deletions
diff --git a/include/speex/speex_jitter.h b/include/speex/speex_jitter.h index a85981a..504fe6b 100644 --- a/include/speex/speex_jitter.h +++ b/include/speex/speex_jitter.h @@ -41,8 +41,7 @@ * @{ */ -#include "speex.h" -#include "speex_bits.h" +#include "speex/speex_types.h" #ifdef __cplusplus extern "C" { @@ -178,45 +177,8 @@ int jitter_buffer_update_delay(JitterBuffer *jitter, JitterBufferPacket *packet, /* @} */ -/** @defgroup SpeexJitter SpeexJitter: Adaptive jitter buffer specifically for Speex - * This is the jitter buffer that reorders UDP/RTP packets and adjusts the buffer size - * to maintain good quality and low latency. This is a simplified version that works only - * with Speex, but is much easier to use. - * @{ -*/ - -/** Speex jitter-buffer state. Never use it directly! */ -typedef struct SpeexJitter { - SpeexBits current_packet; /**< Current Speex packet */ - int valid_bits; /**< True if Speex bits are valid */ - JitterBuffer *packets; /**< Generic jitter buffer state */ - void *dec; /**< Pointer to Speex decoder */ - spx_int32_t frame_size; /**< Frame size of Speex decoder */ -} SpeexJitter; - -/** Initialise jitter buffer - * - * @param jitter State of the Speex jitter buffer - * @param decoder Speex decoder to call - * @param sampling_rate Sampling rate used by the decoder -*/ -void speex_jitter_init(SpeexJitter *jitter, void *decoder, int sampling_rate); - -/** Destroy jitter buffer */ -void speex_jitter_destroy(SpeexJitter *jitter); - -/** Put one packet into the jitter buffer */ -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); - -/** Get pointer timestamp of jitter buffer */ -int speex_jitter_get_pointer_timestamp(SpeexJitter *jitter); - #ifdef __cplusplus } #endif -/* @} */ #endif |