speex.h   speex.h 
skipping to change at line 171 skipping to change at line 171
/* Prototypes for mode function pointers */ /* Prototypes for mode function pointers */
/** Encoder state initialization function */ /** Encoder state initialization function */
typedef void *(*encoder_init_func)(struct SpeexMode *mode); typedef void *(*encoder_init_func)(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);
/** Main encoding function */ /** Main encoding function */
typedef int (*encode_func)(void *state, float *in, SpeexBits *bits); typedef int (*encode_func)(void *state, short *in, SpeexBits *bits);
/** Function for controlling the encoder options */ /** Function for controlling the encoder options */
typedef int (*encoder_ctl_func)(void *state, int request, void *ptr); typedef int (*encoder_ctl_func)(void *state, int request, void *ptr);
/** Decoder state initialization function */ /** Decoder state initialization function */
typedef void *(*decoder_init_func)(struct SpeexMode *mode); typedef void *(*decoder_init_func)(struct SpeexMode *mode);
/** Decoder state destruction function */ /** Decoder state destruction function */
typedef void (*decoder_destroy_func)(void *st); typedef void (*decoder_destroy_func)(void *st);
/** Main decoding function */ /** Main decoding function */
typedef int (*decode_func)(void *state, SpeexBits *bits, float *out); typedef int (*decode_func)(void *state, SpeexBits *bits, short *out);
/** Function for controlling the decoder options */ /** Function for controlling the decoder options */
typedef int (*decoder_ctl_func)(void *state, int request, void *ptr); typedef int (*decoder_ctl_func)(void *state, int request, void *ptr);
/** Query function for a mode */ /** Query function for a mode */
typedef int (*mode_query_func)(void *mode, int request, void *ptr); typedef int (*mode_query_func)(void *mode, int request, void *ptr);
/** Struct defining a Speex mode */ /** Struct defining a Speex mode */
typedef struct SpeexMode { typedef struct SpeexMode {
/** Pointer to the low-level mode data */ /** Pointer to the low-level mode data */
skipping to change at line 256 skipping to change at line 256
/** 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^16 range @param in Frame that will be encoded with a +-2^16 range
@param bits Bit-stream where the data will be written @param bits Bit-stream where the data will be written
*/ */
int speex_encode(void *state, float *in, SpeexBits *bits); int speex_encode(void *state, short *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 frame needs not be transmitted (DTX only), 1 otherwise
*/ */
int speex_encoder_ctl(void *state, int request, void *ptr); int speex_encoder_ctl(void *state, int request, void *ptr);
skipping to change at line 291 skipping to change at line 291
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 other)
*/ */
int speex_decode(void *state, SpeexBits *bits, float *out); int speex_decode(void *state, SpeexBits *bits, short *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 for no error, 1 if a terminator is reached, 2 for another erro r
*/ */
int speex_decoder_ctl(void *state, int request, void *ptr); int speex_decoder_ctl(void *state, int request, void *ptr);
 End of changes. 4 change blocks. 
4 lines changed or deleted 4 lines changed or added


 speex_jitter.h   speex_jitter.h 
skipping to change at line 71 skipping to change at line 71
int interp_frame; int interp_frame;
} 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, float *out); void speex_jitter_get(SpeexJitter *jitter, short *out);
#endif #endif
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 speex_preprocess.h   speex_preprocess.h 
skipping to change at line 102 skipping to change at line 102
} SpeexPreprocessState; } SpeexPreprocessState;
/** Creates a new preprocessing state */ /** Creates a new preprocessing state */
SpeexPreprocessState *speex_preprocess_state_init(int frame_size, int sampl ing_rate); SpeexPreprocessState *speex_preprocess_state_init(int frame_size, int sampl ing_rate);
/** Destroys a denoising state */ /** Destroys a denoising state */
void speex_preprocess_state_destroy(SpeexPreprocessState *st); void speex_preprocess_state_destroy(SpeexPreprocessState *st);
/** Preprocess a frame */ /** Preprocess a frame */
int speex_preprocess(SpeexPreprocessState *st, float *x, float *noise); int speex_preprocess(SpeexPreprocessState *st, short *x, float *noise);
/** Preprocess a frame */ /** Preprocess a frame */
void speex_preprocess_estimate_update(SpeexPreprocessState *st, float *x, f loat *noise); void speex_preprocess_estimate_update(SpeexPreprocessState *st, short *x, f loat *noise);
/** 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);
#define SPEEX_PREPROCESS_SET_DENOISE 0 #define SPEEX_PREPROCESS_SET_DENOISE 0
#define SPEEX_PREPROCESS_GET_DENOISE 1 #define SPEEX_PREPROCESS_GET_DENOISE 1
#define SPEEX_PREPROCESS_SET_AGC 2 #define SPEEX_PREPROCESS_SET_AGC 2
#define SPEEX_PREPROCESS_GET_AGC 3 #define SPEEX_PREPROCESS_GET_AGC 3
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 speex_stereo.h   speex_stereo.h 
skipping to change at line 54 skipping to change at line 54
float smooth_left; /**< Smoothed left channel gain */ float smooth_left; /**< Smoothed left channel gain */
float smooth_right; /**< Smoothed right channel gain */ float smooth_right; /**< Smoothed right channel gain */
float reserved1; /**< Reserved for future use */ float reserved1; /**< Reserved for future use */
float reserved2; /**< Reserved for future use */ float reserved2; /**< Reserved for future use */
} SpeexStereoState; } SpeexStereoState;
/** Initialization value for a stereo state */ /** Initialization value for a stereo state */
#define SPEEX_STEREO_STATE_INIT {1,.5,1,1} #define SPEEX_STEREO_STATE_INIT {1,.5,1,1}
/** Transforms a stereo frame into a mono frame and stores intensity stereo info in 'bits' */ /** Transforms a stereo frame into a mono frame and stores intensity stereo info in 'bits' */
void speex_encode_stereo(float *data, int frame_size, SpeexBits *bits); void speex_encode_stereo(short *data, int frame_size, SpeexBits *bits);
/** Transforms a mono frame into a stereo frame using intensity stereo info */ /** Transforms a mono frame into a stereo frame using intensity stereo info */
void speex_decode_stereo(float *data, int frame_size, SpeexStereoState *ste reo); void speex_decode_stereo(short *data, int frame_size, SpeexStereoState *ste reo);
/** Callback handler for intensity stereo info */ /** Callback handler for intensity stereo info */
int speex_std_stereo_request_handler(SpeexBits *bits, void *state, void *da ta); int speex_std_stereo_request_handler(SpeexBits *bits, void *state, void *da ta);
#endif #endif
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 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/