speex.h   speex.h 
skipping to change at line 134 skipping to change at line 134
/** Set DTX status (1 for on, 0 for off) */ /** Set DTX status (1 for on, 0 for off) */
#define SPEEX_SET_DTX 34 #define SPEEX_SET_DTX 34
/** Get DTX status (1 for on, 0 for off) */ /** Get DTX status (1 for on, 0 for off) */
#define SPEEX_GET_DTX 35 #define SPEEX_GET_DTX 35
/** Set submode encoding in each frame (1 for yes, 0 for no, setting to no breaks the standard) */ /** Set submode encoding in each frame (1 for yes, 0 for no, setting to no breaks the standard) */
#define SPEEX_SET_SUBMODE_ENCODING 36 #define SPEEX_SET_SUBMODE_ENCODING 36
/** */ /** */
#define SPEEX_GET_SUBMODE_ENCODING 37 #define SPEEX_GET_SUBMODE_ENCODING 37
/*#define SPEEX_SET_SUBMODE_ENCODING 38*/
/** */
#define SPEEX_GET_LOOKAHEAD 39
/* Used internally, not to be used in applications */ /* Used internally, not to be used in applications */
/** Used internally*/ /** Used internally*/
#define SPEEX_GET_PI_GAIN 100 #define SPEEX_GET_PI_GAIN 100
/** Used internally*/ /** Used internally*/
#define SPEEX_GET_EXC 101 #define SPEEX_GET_EXC 101
/** Used internally*/ /** Used internally*/
#define SPEEX_GET_INNOV 102 #define SPEEX_GET_INNOV 102
/** Used internally*/ /** Used internally*/
#define SPEEX_GET_DTX_STATUS 103 #define SPEEX_GET_DTX_STATUS 103
skipping to change at line 157 skipping to change at line 161
/** Equivalent to SPEEX_GET_ENH */ /** Equivalent to SPEEX_GET_ENH */
#define SPEEX_GET_PF 1 #define SPEEX_GET_PF 1
/* Values allowed for mode queries */ /* Values allowed for mode queries */
/** Query the frame size of a mode */ /** Query the frame size of a mode */
#define SPEEX_MODE_FRAME_SIZE 0 #define SPEEX_MODE_FRAME_SIZE 0
/** Query the size of an encoded frame for a particular sub-mode */ /** Query the size of an encoded frame for a particular sub-mode */
#define SPEEX_SUBMODE_BITS_PER_FRAME 1 #define SPEEX_SUBMODE_BITS_PER_FRAME 1
#define SPEEX_LIB_GET_MAJOR_VERSION 1
#define SPEEX_LIB_GET_MINOR_VERSION 3
#define SPEEX_LIB_GET_MICRO_VERSION 5
#define SPEEX_LIB_GET_EXTRA_VERSION 7
#define SPEEX_LIB_GET_VERSION_STRING 9
/*#define SPEEX_LIB_SET_ALLOC_FUNC 10
#define SPEEX_LIB_GET_ALLOC_FUNC 11
#define SPEEX_LIB_SET_FREE_FUNC 12
#define SPEEX_LIB_GET_FREE_FUNC 13
#define SPEEX_LIB_SET_WARNING_FUNC 14
#define SPEEX_LIB_GET_WARNING_FUNC 15
#define SPEEX_LIB_SET_ERROR_FUNC 16
#define SPEEX_LIB_GET_ERROR_FUNC 17
*/
/** Number of defined modes in Speex */ /** Number of defined modes in Speex */
#define SPEEX_NB_MODES 3 #define SPEEX_NB_MODES 3
/** modeID for the defined narrowband mode */
#define SPEEX_MODEID_NB 0
/** modeID for the defined wideband mode */
#define SPEEX_MODEID_WB 1
/** modeID for the defined ultra-wideband mode */
#define SPEEX_MODEID_UWB 2
struct SpeexMode; struct SpeexMode;
/* Prototypes for mode function pointers */ /* Prototypes for mode function pointers */
/** Encoder state initialization function */ /** Encoder state initialization function */
typedef void *(*encoder_init_func)(const struct SpeexMode *mode); typedef void *(*encoder_init_func)(const struct SpeexMode *mode);
/** Encoder state destruction function */ /** Encoder state destruction function */
typedef void (*encoder_destroy_func)(void *st); typedef void (*encoder_destroy_func)(void *st);
skipping to change at line 328 skipping to change at line 358
int speex_decoder_ctl(void *state, int request, void *ptr); int speex_decoder_ctl(void *state, int request, void *ptr);
/** Query function for mode information /** Query function for mode information
* *
* @param mode Speex mode * @param mode Speex mode
* @param request ioctl-type request (one of the SPEEX_* macros) * @param request ioctl-type request (one of the SPEEX_* macros)
* @param ptr Data exchanged to-from function * @param ptr Data exchanged to-from function
*/ */
int speex_mode_query(const SpeexMode *mode, int request, void *ptr); int speex_mode_query(const SpeexMode *mode, int request, void *ptr);
/** Functions for controlling the behavior of libspeex
* @param request ioctl-type request (one of the SPEEX_LIB_* macros)
* @param ptr Data exchanged to-from function
*/
int speex_lib_ctl(int request, void *ptr);
/** Default narrowband mode */ /** Default narrowband mode */
extern const SpeexMode speex_nb_mode; extern const SpeexMode speex_nb_mode;
/** Default wideband mode */ /** Default wideband mode */
extern const SpeexMode speex_wb_mode; extern const SpeexMode speex_wb_mode;
/** Default "ultra-wideband" mode */ /** Default "ultra-wideband" mode */
extern const SpeexMode speex_uwb_mode; extern const SpeexMode speex_uwb_mode;
#ifdef EPIC_48K #ifdef EPIC_48K
 End of changes. 4 change blocks. 
0 lines changed or deleted 36 lines changed or added


 speex_echo.h   speex_echo.h 
skipping to change at line 60 skipping to change at line 60
float *d; float *d;
float *D; float *D;
float *y; float *y;
float *Y; float *Y;
float *E; float *E;
float *PHI; float *PHI;
float *W; float *W;
float *power; float *power;
float *power_1; float *power_1;
float *grad; float *grad;
float *old_grad;
struct drft_lookup *fft_lookup; struct drft_lookup *fft_lookup;
} SpeexEchoState; } SpeexEchoState;
/** Creates a new echo canceller state */ /** Creates a new echo canceller state */
SpeexEchoState *speex_echo_state_init(int frame_size, int filter_length); SpeexEchoState *speex_echo_state_init(int frame_size, int filter_length);
/** Destroys an echo canceller state */ /** Destroys an echo canceller state */
void speex_echo_state_destroy(SpeexEchoState *st); void speex_echo_state_destroy(SpeexEchoState *st);
/** Performs echo cancellation a frame */ /** Performs echo cancellation a frame */
void speex_echo_cancel(SpeexEchoState *st, short *ref, short *echo, short * out, int *Y); void speex_echo_cancel(SpeexEchoState *st, short *ref, short *echo, short * out, int *Y);
/** Reset the echo canceller state */
void speex_echo_reset(SpeexEchoState *st);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
 End of changes. 2 change blocks. 
1 lines changed or deleted 3 lines changed or added


 speex_jitter.h   speex_jitter.h 
skipping to change at line 45 skipping to change at line 45
#ifndef SPEEX_JITTER_H #ifndef SPEEX_JITTER_H
#define SPEEX_JITTER_H #define SPEEX_JITTER_H
#include "speex.h" #include "speex.h"
#include "speex_bits.h" #include "speex_bits.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#define SPEEX_JITTER_MAX_PACKET_SIZE 2000 #define SPEEX_JITTER_MAX_PACKET_SIZE 1500
#define SPEEX_JITTER_MAX_BUFFER_SIZE 20 #define SPEEX_JITTER_MAX_BUFFER_SIZE 20
#define MAX_MARGIN 12
typedef struct SpeexJitter { typedef struct SpeexJitter {
int buffer_size; int buffer_size;
int pointer_timestamp; int pointer_timestamp;
SpeexBits current_packet; SpeexBits current_packet;
int valid_bits; int valid_bits;
char buf[SPEEX_JITTER_MAX_BUFFER_SIZE][SPEEX_JITTER_MAX_PACKET_SIZE]; char buf[SPEEX_JITTER_MAX_BUFFER_SIZE][SPEEX_JITTER_MAX_PACKET_SIZE];
int timestamp[SPEEX_JITTER_MAX_BUFFER_SIZE]; int timestamp[SPEEX_JITTER_MAX_BUFFER_SIZE];
int len[SPEEX_JITTER_MAX_BUFFER_SIZE]; int len[SPEEX_JITTER_MAX_BUFFER_SIZE];
void *dec; void *dec;
int frame_size; int frame_size;
int frame_time; int frame_time;
int reset_state;
int underflow_count; int lost_count;
int drop_frame; float shortterm_margin[MAX_MARGIN];
int interp_frame; float longterm_margin[MAX_MARGIN];
float loss_rate;
} SpeexJitter; } SpeexJitter;
void speex_jitter_init(SpeexJitter *jitter, void *decoder, int sampling_rat e); void speex_jitter_init(SpeexJitter *jitter, void *decoder, int sampling_rat e);
void speex_jitter_destroy(SpeexJitter *jitter); void speex_jitter_destroy(SpeexJitter *jitter);
void speex_jitter_put(SpeexJitter *jitter, char *packet, int len, int time) ; void speex_jitter_put(SpeexJitter *jitter, char *packet, int len, int time) ;
void speex_jitter_get(SpeexJitter *jitter, short *out); void speex_jitter_get(SpeexJitter *jitter, short *out, int *current_timesta mp);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
 End of changes. 5 change blocks. 
6 lines changed or deleted 9 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/