diff options
Diffstat (limited to 'apps/codecs/libspeex/speex/speex.h')
-rw-r--r-- | apps/codecs/libspeex/speex/speex.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/apps/codecs/libspeex/speex/speex.h b/apps/codecs/libspeex/speex/speex.h index 0ae1abad34..0ff4be135f 100644 --- a/apps/codecs/libspeex/speex/speex.h +++ b/apps/codecs/libspeex/speex/speex.h | |||
@@ -155,6 +155,10 @@ extern "C" { | |||
155 | /** Get status of input/output high-pass filtering */ | 155 | /** Get status of input/output high-pass filtering */ |
156 | #define SPEEX_GET_HIGHPASS 45 | 156 | #define SPEEX_GET_HIGHPASS 45 |
157 | 157 | ||
158 | /** Get "activity level" of the last decoded frame, i.e. | ||
159 | now much damage we cause if we remove the frame */ | ||
160 | #define SPEEX_GET_ACTIVITY 47 | ||
161 | |||
158 | 162 | ||
159 | /* Preserving compatibility:*/ | 163 | /* Preserving compatibility:*/ |
160 | /** Equivalent to SPEEX_SET_ENH */ | 164 | /** Equivalent to SPEEX_SET_ENH */ |
@@ -297,7 +301,7 @@ typedef struct SpeexMode { | |||
297 | * encode, you need one state per channel. | 301 | * encode, you need one state per channel. |
298 | * | 302 | * |
299 | * @param mode The mode to use (either speex_nb_mode or speex_wb.mode) | 303 | * @param mode The mode to use (either speex_nb_mode or speex_wb.mode) |
300 | * @return A newly created encoder | 304 | * @return A newly created encoder state or NULL if state allocation fails |
301 | */ | 305 | */ |
302 | void *speex_encoder_init(const SpeexMode *mode); | 306 | void *speex_encoder_init(const SpeexMode *mode); |
303 | 307 | ||
@@ -330,7 +334,7 @@ int speex_encode_int(void *state, spx_int16_t *in, SpeexBits *bits); | |||
330 | * @param state Encoder state | 334 | * @param state Encoder state |
331 | * @param request ioctl-type request (one of the SPEEX_* macros) | 335 | * @param request ioctl-type request (one of the SPEEX_* macros) |
332 | * @param ptr Data exchanged to-from function | 336 | * @param ptr Data exchanged to-from function |
333 | * @return 0 if no error, -1 if request in unknown | 337 | * @return 0 if no error, -1 if request in unknown, -2 for invalid parameter |
334 | */ | 338 | */ |
335 | int speex_encoder_ctl(void *state, int request, void *ptr); | 339 | int speex_encoder_ctl(void *state, int request, void *ptr); |
336 | 340 | ||
@@ -341,7 +345,7 @@ int speex_encoder_ctl(void *state, int request, void *ptr); | |||
341 | * decode, you need one state per channel. | 345 | * decode, you need one state per channel. |
342 | * | 346 | * |
343 | * @param mode Speex mode (one of speex_nb_mode or speex_wb_mode) | 347 | * @param mode Speex mode (one of speex_nb_mode or speex_wb_mode) |
344 | * @return A newly created decoder state | 348 | * @return A newly created decoder state or NULL if state allocation fails |
345 | */ | 349 | */ |
346 | void *speex_decoder_init(const SpeexMode *mode); | 350 | void *speex_decoder_init(const SpeexMode *mode); |
347 | 351 | ||
@@ -376,7 +380,7 @@ int speex_decode_int(void *state, SpeexBits *bits, spx_int16_t *out); | |||
376 | * @param state Decoder state | 380 | * @param state Decoder state |
377 | * @param request ioctl-type request (one of the SPEEX_* macros) | 381 | * @param request ioctl-type request (one of the SPEEX_* macros) |
378 | * @param ptr Data exchanged to-from function | 382 | * @param ptr Data exchanged to-from function |
379 | * @return 0 if no error, -1 if request in unknown | 383 | * @return 0 if no error, -1 if request in unknown, -2 for invalid parameter |
380 | */ | 384 | */ |
381 | int speex_decoder_ctl(void *state, int request, void *ptr); | 385 | int speex_decoder_ctl(void *state, int request, void *ptr); |
382 | 386 | ||
@@ -386,12 +390,14 @@ int speex_decoder_ctl(void *state, int request, void *ptr); | |||
386 | * @param mode Speex mode | 390 | * @param mode Speex mode |
387 | * @param request ioctl-type request (one of the SPEEX_* macros) | 391 | * @param request ioctl-type request (one of the SPEEX_* macros) |
388 | * @param ptr Data exchanged to-from function | 392 | * @param ptr Data exchanged to-from function |
393 | * @return 0 if no error, -1 if request in unknown, -2 for invalid parameter | ||
389 | */ | 394 | */ |
390 | int speex_mode_query(const SpeexMode *mode, int request, void *ptr); | 395 | int speex_mode_query(const SpeexMode *mode, int request, void *ptr); |
391 | 396 | ||
392 | /** Functions for controlling the behavior of libspeex | 397 | /** Functions for controlling the behavior of libspeex |
393 | * @param request ioctl-type request (one of the SPEEX_LIB_* macros) | 398 | * @param request ioctl-type request (one of the SPEEX_LIB_* macros) |
394 | * @param ptr Data exchanged to-from function | 399 | * @param ptr Data exchanged to-from function |
400 | * @return 0 if no error, -1 if request in unknown, -2 for invalid parameter | ||
395 | */ | 401 | */ |
396 | int speex_lib_ctl(int request, void *ptr); | 402 | int speex_lib_ctl(int request, void *ptr); |
397 | 403 | ||