diff options
author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2013-03-08 12:29:53 -0500 |
---|---|---|
committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2013-03-08 12:29:53 -0500 |
commit | f96fc8cc839331ae5e6e596fb931bf8261e129ff (patch) | |
tree | 05b841eb36fa15606f0e9e5b8157e7414c1ef130 /src/opus_private.h | |
parent | fa43c770e0fd0ebc796a61a32c305dfcf3869128 (diff) | |
parent | 73142b100adebe4321d3919ab657f510b7cfe40d (diff) | |
download | opus-f96fc8cc839331ae5e6e596fb931bf8261e129ff.tar.gz |
Merge branch 'exp_analysis'
Conflicts:
celt/celt_encoder.c
Diffstat (limited to 'src/opus_private.h')
-rw-r--r-- | src/opus_private.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/opus_private.h b/src/opus_private.h index c9a4ff53..2caac689 100644 --- a/src/opus_private.h +++ b/src/opus_private.h @@ -31,6 +31,7 @@ #include "arch.h" #include "opus.h" +#include "celt.h" struct OpusRepacketizer { unsigned char toc; @@ -81,11 +82,24 @@ int get_mono_channel(const ChannelLayout *layout, int stream_id, int prev); #define OPUS_SET_FORCE_MODE_REQUEST 11002 #define OPUS_SET_FORCE_MODE(x) OPUS_SET_FORCE_MODE_REQUEST, __opus_check_int(x) +typedef void (*downmix_func)(const void *, float *, int, int, int); +void downmix_float(const void *_x, float *sub, int subframe, int offset, int C); +void downmix_int(const void *_x, float *sub, int subframe, int offset, int C); + +int optimize_framesize(const opus_val16 *x, int len, int C, opus_int32 Fs, + int bitrate, opus_val16 tonality, opus_val32 *mem, int buffering, + downmix_func downmix); int encode_size(int size, unsigned char *data); +opus_int32 frame_size_select(opus_int32 frame_size, int variable_duration, opus_int32 Fs); + opus_int32 opus_encode_native(OpusEncoder *st, const opus_val16 *pcm, int frame_size, - unsigned char *data, opus_int32 out_data_bytes, int lsb_depth); + unsigned char *data, opus_int32 out_data_bytes, int lsb_depth +#ifndef FIXED_POINT + , AnalysisInfo *analysis_info +#endif + ); int opus_decode_native(OpusDecoder *st, const unsigned char *data, opus_int32 len, opus_val16 *pcm, int frame_size, int decode_fec, int self_delimited, |