From b90e63b5bab727bc33dce854b6a4d7e325fef3ab Mon Sep 17 00:00:00 2001 From: Jean-Marc Valin Date: Mon, 16 Sep 2013 13:08:52 -0400 Subject: Moves frame size selection back out of opus_encode_native() Should fix delayed decision on surround, but not well tested. --- src/opus_private.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/opus_private.h') diff --git a/src/opus_private.h b/src/opus_private.h index 64c325ab..0e739ebb 100644 --- a/src/opus_private.h +++ b/src/opus_private.h @@ -94,9 +94,13 @@ 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 compute_frame_size(const void *analysis_pcm, int frame_size, + int variable_duration, int C, opus_int32 Fs, int bitrate_bps, + int delay_compensation, downmix_func downmix, opus_val32 *subframe_mem); + 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, - const void *analysis_pcm, int c1, int c2, int analysis_channels, downmix_func downmix); + const void *analysis_pcm, opus_int32 analysis_size, int c1, int c2, int analysis_channels, downmix_func downmix); 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, -- cgit v1.2.1