speex.h   speex.h 
skipping to change at line 97 skipping to change at line 97
/** Set complexity of the encoder (0-10) */ /** Set complexity of the encoder (0-10) */
#define SPEEX_SET_COMPLEXITY 16 #define SPEEX_SET_COMPLEXITY 16
/** Get current complexity of the encoder (0-10) */ /** Get current complexity of the encoder (0-10) */
#define SPEEX_GET_COMPLEXITY 17 #define SPEEX_GET_COMPLEXITY 17
/** Set bit-rate used by the encoder (or lower) */ /** Set bit-rate used by the encoder (or lower) */
#define SPEEX_SET_BITRATE 18 #define SPEEX_SET_BITRATE 18
/** Get current bit-rate used by the encoder or decoder */ /** Get current bit-rate used by the encoder or decoder */
#define SPEEX_GET_BITRATE 19 #define SPEEX_GET_BITRATE 19
/**Define a handler function for in-band Speex request*/ /** Define a handler function for in-band Speex request*/
#define SPEEX_SET_HANDLER 20 #define SPEEX_SET_HANDLER 20
/**Define a handler function for in-band user-defined request*/ /** Define a handler function for in-band user-defined request*/
#define SPEEX_SET_USER_HANDLER 22 #define SPEEX_SET_USER_HANDLER 22
/** Set sampling rate used in bit-rate computation */ /** Set sampling rate used in bit-rate computation */
#define SPEEX_SET_SAMPLING_RATE 24 #define SPEEX_SET_SAMPLING_RATE 24
/** Get sampling rate used in bit-rate computation */ /** Get sampling rate used in bit-rate computation */
#define SPEEX_GET_SAMPLING_RATE 25 #define SPEEX_GET_SAMPLING_RATE 25
/** Reset the encoder/decoder memories to zero*/ /** Reset the encoder/decoder memories to zero*/
#define SPEEX_RESET_STATE 26 #define SPEEX_RESET_STATE 26
skipping to change at line 132 skipping to change at line 132
/** Get Average Bit-Rate (ABR) setting (in bps) */ /** Get Average Bit-Rate (ABR) setting (in bps) */
#define SPEEX_GET_ABR 33 #define SPEEX_GET_ABR 33
/** 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
/** */ /** Get submode encoding in each frame */
#define SPEEX_GET_SUBMODE_ENCODING 37 #define SPEEX_GET_SUBMODE_ENCODING 37
/*#define SPEEX_SET_LOOKAHEAD 38*/ /*#define SPEEX_SET_LOOKAHEAD 38*/
/** Returns the lookahead used by Speex */ /** Returns the lookahead used by Speex */
#define SPEEX_GET_LOOKAHEAD 39 #define SPEEX_GET_LOOKAHEAD 39
/** Sets tuning for packet-loss concealment (expected loss rate) */ /** Sets tuning for packet-loss concealment (expected loss rate) */
#define SPEEX_SET_PLC_TUNING 40 #define SPEEX_SET_PLC_TUNING 40
/** Gets tuning for PLC */ /** Gets tuning for PLC */
#define SPEEX_GET_PLC_TUNING 41 #define SPEEX_GET_PLC_TUNING 41
skipping to change at line 167 skipping to change at line 167
/** 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
/** Get major Speex version */
#define SPEEX_LIB_GET_MAJOR_VERSION 1 #define SPEEX_LIB_GET_MAJOR_VERSION 1
/** Get minor Speex version */
#define SPEEX_LIB_GET_MINOR_VERSION 3 #define SPEEX_LIB_GET_MINOR_VERSION 3
/** Get micro Speex version */
#define SPEEX_LIB_GET_MICRO_VERSION 5 #define SPEEX_LIB_GET_MICRO_VERSION 5
/** Get extra Speex version */
#define SPEEX_LIB_GET_EXTRA_VERSION 7 #define SPEEX_LIB_GET_EXTRA_VERSION 7
/** Get Speex version string */
#define SPEEX_LIB_GET_VERSION_STRING 9 #define SPEEX_LIB_GET_VERSION_STRING 9
/*#define SPEEX_LIB_SET_ALLOC_FUNC 10 /*#define SPEEX_LIB_SET_ALLOC_FUNC 10
#define SPEEX_LIB_GET_ALLOC_FUNC 11 #define SPEEX_LIB_GET_ALLOC_FUNC 11
#define SPEEX_LIB_SET_FREE_FUNC 12 #define SPEEX_LIB_SET_FREE_FUNC 12
#define SPEEX_LIB_GET_FREE_FUNC 13 #define SPEEX_LIB_GET_FREE_FUNC 13
#define SPEEX_LIB_SET_WARNING_FUNC 14 #define SPEEX_LIB_SET_WARNING_FUNC 14
#define SPEEX_LIB_GET_WARNING_FUNC 15 #define SPEEX_LIB_GET_WARNING_FUNC 15
#define SPEEX_LIB_SET_ERROR_FUNC 16 #define SPEEX_LIB_SET_ERROR_FUNC 16
skipping to change at line 296 skipping to change at line 301
/** Frees all resources associated to an existing Speex encoder state. /** Frees all resources associated to an existing Speex encoder state.
* @param state Encoder state to be destroyed */ * @param state Encoder state to be destroyed */
void speex_encoder_destroy(void *state); void speex_encoder_destroy(void *state);
/** Uses an existing encoder state to encode one frame of speech pointed to by /** Uses an existing encoder state to encode one frame of speech pointed to by
"in". The encoded bit-stream is saved in "bits". "in". The encoded bit-stream is saved in "bits".
@param state Encoder state @param state Encoder state
@param in Frame that will be encoded with a +-2^15 range @param in Frame that will be encoded with a +-2^15 range
@param bits Bit-stream where the data will be written @param bits Bit-stream where the data will be written
@return 0 if frame needs not be transmitted (DTX only), 1 otherwise
*/ */
int speex_encode(void *state, float *in, SpeexBits *bits); int speex_encode(void *state, float *in, SpeexBits *bits);
/** Uses an existing encoder state to encode one frame of speech pointed to by /** Uses an existing encoder state to encode one frame of speech pointed to by
"in". The encoded bit-stream is saved in "bits". "in". The encoded bit-stream is saved in "bits".
@param state Encoder state @param state Encoder state
@param in Frame that will be encoded with a +-2^15 range @param in Frame that will be encoded with a +-2^15 range
@param bits Bit-stream where the data will be written @param bits Bit-stream where the data will be written
@return 0 if frame needs not be transmitted (DTX only), 1 otherwise
*/ */
int speex_encode_int(void *state, spx_int16_t *in, SpeexBits *bits); int speex_encode_int(void *state, spx_int16_t *in, SpeexBits *bits);
/** Used like the ioctl function to control the encoder parameters /** Used like the ioctl function to control the encoder parameters
* *
* @param state Encoder state * @param state Encoder state
* @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
* @return 0 if frame needs not be transmitted (DTX only), 1 otherwise * @return 0 if no error, -1 if request in unknown
*/ */
int speex_encoder_ctl(void *state, int request, void *ptr); int speex_encoder_ctl(void *state, int request, void *ptr);
/** Returns a handle to a newly created decoder state structure. For now, /** Returns a handle to a newly created decoder state structure. For now,
* the mode argument can be &nb_mode or &wb_mode . In the future, more mode s * the mode argument can be &nb_mode or &wb_mode . In the future, more mode s
* may be added. Note that for now if you have more than one channels to * may be added. Note that for now if you have more than one channels to
* decode, you need one state per channel. * decode, you need one state per channel.
* *
* @param mode Speex mode (one of speex_nb_mode or speex_wb_mode) * @param mode Speex mode (one of speex_nb_mode or speex_wb_mode)
* @return A newly created decoder state * @return A newly created decoder state
skipping to change at line 338 skipping to change at line 345
* @param state State to be destroyed * @param state State to be destroyed
*/ */
void speex_decoder_destroy(void *state); void speex_decoder_destroy(void *state);
/** Uses an existing decoder state to decode one frame of speech from /** Uses an existing decoder state to decode one frame of speech from
* bit-stream bits. The output speech is saved written to out. * bit-stream bits. The output speech is saved written to out.
* *
* @param state Decoder state * @param state Decoder state
* @param bits Bit-stream from which to decode the frame (NULL if the packe t was lost) * @param bits Bit-stream from which to decode the frame (NULL if the packe t was lost)
* @param out Where to write the decoded frame * @param out Where to write the decoded frame
* @return return status (0 for no error, -1 for end of stream, -2 other) * @return return status (0 for no error, -1 for end of stream, -2 corrupt stream)
*/ */
int speex_decode(void *state, SpeexBits *bits, float *out); int speex_decode(void *state, SpeexBits *bits, float *out);
/** Uses an existing decoder state to decode one frame of speech from /** Uses an existing decoder state to decode one frame of speech from
* bit-stream bits. The output speech is saved written to out. * bit-stream bits. The output speech is saved written to out.
* *
* @param state Decoder state * @param state Decoder state
* @param bits Bit-stream from which to decode the frame (NULL if the packe t was lost) * @param bits Bit-stream from which to decode the frame (NULL if the packe t was lost)
* @param out Where to write the decoded frame * @param out Where to write the decoded frame
* @return return status (0 for no error, -1 for end of stream, -2 other) * @return return status (0 for no error, -1 for end of stream, -2 corrupt stream)
*/ */
int speex_decode_int(void *state, SpeexBits *bits, spx_int16_t *out); int speex_decode_int(void *state, SpeexBits *bits, spx_int16_t *out);
/** Used like the ioctl function to control the encoder parameters /** Used like the ioctl function to control the encoder parameters
* *
* @param state Decoder state * @param state Decoder state
* @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
* @return 0 for no error, 1 if a terminator is reached, 2 for another erro r * @return 0 if no error, -1 if request in unknown
*/ */
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);
 End of changes. 14 change blocks. 
7 lines changed or deleted 14 lines changed or added


 speex_echo.h   speex_echo.h 
/* Copyright (C) Jean-Marc Valin /* Copyright (C) Jean-Marc Valin */
/**
File: speex_echo.h @file speex_echo.h
@brief Echo cancellation
*/
/*
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are modification, are permitted provided that the following conditions are
met: met:
1. Redistributions of source code must retain the above copyright notice , 1. Redistributions of source code must retain the above copyright notice ,
this list of conditions and the following disclaimer. this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright 2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution. documentation and/or other materials provided with the distribution.
skipping to change at line 41 skipping to change at line 43
#ifndef SPEEX_ECHO_H #ifndef SPEEX_ECHO_H
#define SPEEX_ECHO_H #define SPEEX_ECHO_H
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
struct drft_lookup; struct drft_lookup;
/** Speex echo cancellation state. */
typedef struct SpeexEchoState { typedef struct SpeexEchoState {
int frame_size; /**< Number of samples processed each time */ int frame_size; /**< Number of samples processed each time */
int window_size; int window_size;
int M; int M;
int cancel_count; int cancel_count;
int adapted; int adapted;
float adapt_rate;
float sum_adapt; float sum_adapt;
float Sey;
float Syy;
float See;
float *x; float *x;
float *X; float *X;
float *d; float *d;
float *D;
float *y; float *y;
float *y2;
float *last_y; float *last_y;
float *Yps; float *Yps;
float *Y; float *Y;
float *Y2;
float *E; float *E;
float *PHI; float *PHI;
float * __restrict W; float *W;
float *power; float *power;
float *power_1; float *power_1;
float *grad;
float *Rf; float *Rf;
float *Yf; float *Yf;
float *Xf; float *Xf;
float *fratio; float *Eh;
float *regul; float *Yh;
float Pey;
float Pyy;
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);
 End of changes. 10 change blocks. 
16 lines changed or deleted 12 lines changed or added


 speex_jitter.h   speex_jitter.h 
/* Copyright (C) 2002 Jean-Marc Valin /* Copyright (C) 2002 Jean-Marc Valin */
File: speex_jitter.h /**
@file speex_jitter.h
Adaptive jitter buffer for Speex @brief Adaptive jitter buffer for Speex
*/
/*
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions modification, are permitted provided that the following conditions
are met: are met:
- Redistributions of source code must retain the above copyright - Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer. notice, this list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above copyright - Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution. documentation and/or other materials provided with the distribution.
skipping to change at line 45 skipping to change at line 46
#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 1500 #define SPEEX_JITTER_MAX_PACKET_SIZE 1500 /**< Maximum number of bytes per
#define SPEEX_JITTER_MAX_BUFFER_SIZE 20 packet */
#define SPEEX_JITTER_MAX_BUFFER_SIZE 20 /**< Maximum number of packets in
jitter buffer */
#define MAX_MARGIN 12 #define MAX_MARGIN 12 /**< Number of bins in margin histogram */
/** Speex jitter-buffer state. */
typedef struct SpeexJitter { typedef struct SpeexJitter {
int buffer_size; int buffer_size; /
int pointer_timestamp; **< Buffer size */
int pointer_timestamp; /
**< Pointer timestamp */
SpeexBits current_packet; SpeexBits current_packet; /
int valid_bits; **< Current Speex packet */
int valid_bits; /
**< True if Speex bits are valid */
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]; **< Buffer of packets */
int len[SPEEX_JITTER_MAX_BUFFER_SIZE]; int timestamp[SPEEX_JITTER_MAX_BUFFER_SIZE]; /
**< Timestamp of packet */
int len[SPEEX_JITTER_MAX_BUFFER_SIZE]; /
**< Number of bytes in packet */
void *dec; void *dec; /
int frame_size; **< Pointer to Speex decoder */
int frame_time; int frame_size; /
int reset_state; **< Frame size of Speex decoder */
int frame_time; /
**< Frame time in [ms] of Speex decoder */
int reset_state; /
**< True if Speex state was reset */
int lost_count; int lost_count; /
float shortterm_margin[MAX_MARGIN]; **< Number of lost packets */
float longterm_margin[MAX_MARGIN]; float shortterm_margin[MAX_MARGIN]; /
float loss_rate; **< Short term margins */
float longterm_margin[MAX_MARGIN]; /
**< Long term margins */
float loss_rate; /
**< Loss rate */
} SpeexJitter; } SpeexJitter;
/** Initialise jitter buffer */
void speex_jitter_init(SpeexJitter *jitter, void *decoder, int sampling_rat e); void speex_jitter_init(SpeexJitter *jitter, void *decoder, int sampling_rat e);
/** Destroy jitter buffer */
void speex_jitter_destroy(SpeexJitter *jitter); void speex_jitter_destroy(SpeexJitter *jitter);
void speex_jitter_put(SpeexJitter *jitter, char *packet, int len, int time) /** Put one packet into the jitter buffer */
; void speex_jitter_put(SpeexJitter *jitter, char *packet, int len, int times
tamp);
/** Get one packet from the jitter buffer */
void speex_jitter_get(SpeexJitter *jitter, short *out, int *current_timesta mp); void speex_jitter_get(SpeexJitter *jitter, short *out, int *current_timesta mp);
/** Get pointer timestamp of jitter buffer */
int speex_jitter_get_pointer_timestamp(SpeexJitter *jitter); int speex_jitter_get_pointer_timestamp(SpeexJitter *jitter);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
 End of changes. 14 change blocks. 
25 lines changed or deleted 49 lines changed or added


 speex_preprocess.h   speex_preprocess.h 
/* Copyright (C) 2003 Epic Games /* Copyright (C) 2003 Epic Games
Written by Jean-Marc Valin Written by Jean-Marc Valin */
/**
File: speex_preprocess.h @file speex_preprocess.h
@brief Speex preprocessor
*/
/*
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are modification, are permitted provided that the following conditions are
met: met:
1. Redistributions of source code must retain the above copyright notice , 1. Redistributions of source code must retain the above copyright notice ,
this list of conditions and the following disclaimer. this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright 2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution. documentation and/or other materials provided with the distribution.
skipping to change at line 44 skipping to change at line 46
#define SPEEX_PREPROCESS_H #define SPEEX_PREPROCESS_H
#include "speex/speex_types.h" #include "speex/speex_types.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
struct drft_lookup; struct drft_lookup;
/** Speex pre-processor state. */
typedef struct SpeexPreprocessState { typedef struct SpeexPreprocessState {
int frame_size; /**< Number of samples processed each time */ int frame_size; /**< Number of samples processed each time */
int ps_size; /**< Number of points in the power spectrum */ int ps_size; /**< Number of points in the power spectrum */
int sampling_rate; /**< Sampling rate of the input/output */ int sampling_rate; /**< Sampling rate of the input/output */
/* parameters */ /* parameters */
int denoise_enabled; int denoise_enabled;
int agc_enabled; int agc_enabled;
float agc_level; float agc_level;
int vad_enabled; int vad_enabled;
int dereverb_enabled; int dereverb_enabled;
float reverb_decay; float reverb_decay;
float reverb_level; float reverb_level;
float speech_prob_start;
float speech_prob_continue;
float *frame; /**< Processing frame (2*ps_size) */ float *frame; /**< Processing frame (2*ps_size) */
float *ps; /**< Current power spectrum */ float *ps; /**< Current power spectrum */
float *gain2; /**< Adjusted gains */ float *gain2; /**< Adjusted gains */
float *window; /**< Analysis/Synthesis window */ float *window; /**< Analysis/Synthesis window */
float *noise; /**< Noise estimate */ float *noise; /**< Noise estimate */
float *reverb_estimate; /**< Estimate of reverb energy */ float *reverb_estimate; /**< Estimate of reverb energy */
float *old_ps; /**< Power spectrum for last frame */ float *old_ps; /**< Power spectrum for last frame */
float *gain; /**< Ephraim Malah gain */ float *gain; /**< Ephraim Malah gain */
float *prior; /**< A-priori SNR */ float *prior; /**< A-priori SNR */
skipping to change at line 119 skipping to change at line 124
/** Preprocess a frame */ /** Preprocess a frame */
int speex_preprocess(SpeexPreprocessState *st, spx_int16_t *x, float *echo) ; int speex_preprocess(SpeexPreprocessState *st, spx_int16_t *x, float *echo) ;
/** Preprocess a frame */ /** Preprocess a frame */
void speex_preprocess_estimate_update(SpeexPreprocessState *st, spx_int16_t *x, float *echo); void speex_preprocess_estimate_update(SpeexPreprocessState *st, spx_int16_t *x, float *echo);
/** Used like the ioctl function to control the preprocessor parameters */ /** Used like the ioctl function to control the preprocessor parameters */
int speex_preprocess_ctl(SpeexPreprocessState *st, int request, void *ptr); int speex_preprocess_ctl(SpeexPreprocessState *st, int request, void *ptr);
/** Set preprocessor denoiser state */
#define SPEEX_PREPROCESS_SET_DENOISE 0 #define SPEEX_PREPROCESS_SET_DENOISE 0
/** Get preprocessor denoiser state */
#define SPEEX_PREPROCESS_GET_DENOISE 1 #define SPEEX_PREPROCESS_GET_DENOISE 1
/** Set preprocessor Automatic Gain Control state */
#define SPEEX_PREPROCESS_SET_AGC 2 #define SPEEX_PREPROCESS_SET_AGC 2
/** Get preprocessor Automatic Gain Control state */
#define SPEEX_PREPROCESS_GET_AGC 3 #define SPEEX_PREPROCESS_GET_AGC 3
/** Set preprocessor Voice Activity Detection state */
#define SPEEX_PREPROCESS_SET_VAD 4 #define SPEEX_PREPROCESS_SET_VAD 4
/** Get preprocessor Voice Activity Detection state */
#define SPEEX_PREPROCESS_GET_VAD 5 #define SPEEX_PREPROCESS_GET_VAD 5
/** Set preprocessor Automatic Gain Control level */
#define SPEEX_PREPROCESS_SET_AGC_LEVEL 6 #define SPEEX_PREPROCESS_SET_AGC_LEVEL 6
/** Get preprocessor Automatic Gain Control level */
#define SPEEX_PREPROCESS_GET_AGC_LEVEL 7 #define SPEEX_PREPROCESS_GET_AGC_LEVEL 7
/** Set preprocessor dereverb state */
#define SPEEX_PREPROCESS_SET_DEREVERB 8 #define SPEEX_PREPROCESS_SET_DEREVERB 8
/** Get preprocessor dereverb state */
#define SPEEX_PREPROCESS_GET_DEREVERB 9 #define SPEEX_PREPROCESS_GET_DEREVERB 9
/** Set preprocessor dereverb level */
#define SPEEX_PREPROCESS_SET_DEREVERB_LEVEL 10 #define SPEEX_PREPROCESS_SET_DEREVERB_LEVEL 10
/** Get preprocessor dereverb level */
#define SPEEX_PREPROCESS_GET_DEREVERB_LEVEL 11 #define SPEEX_PREPROCESS_GET_DEREVERB_LEVEL 11
/** Set preprocessor dereverb decay */
#define SPEEX_PREPROCESS_SET_DEREVERB_DECAY 12 #define SPEEX_PREPROCESS_SET_DEREVERB_DECAY 12
/** Get preprocessor dereverb decay */
#define SPEEX_PREPROCESS_GET_DEREVERB_DECAY 13 #define SPEEX_PREPROCESS_GET_DEREVERB_DECAY 13
#define SPEEX_PREPROCESS_SET_PROB_START 14
#define SPEEX_PREPROCESS_GET_PROB_START 15
#define SPEEX_PREPROCESS_SET_PROB_CONTINUE 16
#define SPEEX_PREPROCESS_GET_PROB_CONTINUE 17
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
 End of changes. 18 change blocks. 
4 lines changed or deleted 29 lines changed or added


 speex_types.h   speex_types.h 
skipping to change at line 18 skipping to change at line 18
* * * *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2002 * * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2002 *
* by the Xiph.Org Foundation http://www.xiph.org/ * * by the Xiph.Org Foundation http://www.xiph.org/ *
* * * *
******************************************************************** ********************************************************************
function: #ifdef jail to whip a few platforms into the UNIX ideal. function: #ifdef jail to whip a few platforms into the UNIX ideal.
last mod: $Id: os_types.h 7524 2004-08-11 04:20:36Z conrad $ last mod: $Id: os_types.h 7524 2004-08-11 04:20:36Z conrad $
********************************************************************/ ********************************************************************/
/**
@file speex_types.h
@brief Speex types
*/
#ifndef _SPEEX_TYPES_H #ifndef _SPEEX_TYPES_H
#define _SPEEX_TYPES_H #define _SPEEX_TYPES_H
#if defined(_WIN32) #if defined(_WIN32)
# if defined(__CYGWIN__) # if defined(__CYGWIN__)
# include <_G_config.h> # include <_G_config.h>
typedef _G_int64_t spx_int64_t; typedef _G_int64_t spx_int64_t;
typedef _G_int32_t spx_int32_t; typedef _G_int32_t spx_int32_t;
typedef _G_uint32_t spx_uint32_t; typedef _G_uint32_t spx_uint32_t;
skipping to change at line 114 skipping to change at line 118
#elif defined(__SYMBIAN32__) #elif defined(__SYMBIAN32__)
/* Symbian GCC */ /* Symbian GCC */
typedef signed short spx_int16_t; typedef signed short spx_int16_t;
typedef unsigned short spx_uint16_t; typedef unsigned short spx_uint16_t;
typedef signed int spx_int32_t; typedef signed int spx_int32_t;
typedef unsigned int spx_uint32_t; typedef unsigned int spx_uint32_t;
typedef long long int spx_int64_t; typedef long long int spx_int64_t;
#elif defined(CONFIG_TI_C54X) || defined (CONFIG_TI_C55X)
typedef short spx_int16_t;
typedef unsigned short spx_uint16_t;
typedef long spx_int32_t;
typedef unsigned long spx_uint32_t;
#elif defined(CONFIG_TI_C5X)
typedef short spx_int16_t;
typedef unsigned short spx_uint16_t;
typedef int spx_int32_t;
typedef unsigned int spx_uint32_t;
#else #else
# include <speex/speex_config_types.h> # include <speex/speex_config_types.h>
#endif #endif
#endif /* _SPEEX_TYPES_H */ #endif /* _SPEEX_TYPES_H */
 End of changes. 2 change blocks. 
0 lines changed or deleted 18 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/