diff options
| author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2012-12-20 00:23:01 -0500 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2012-12-20 00:23:01 -0500 |
| commit | 94b81ea9f3ed77e90d10e9c3f78fc7c7901b6e6d (patch) | |
| tree | 1ea6466c27986e0b08e9a9901ac7ac5cd4bc8dbe /src/opus_multistream_encoder.c | |
| parent | bfd66aa3ab520649ec43eb30742eae68e9676b42 (diff) | |
| download | opus-exp_analysis9.tar.gz | |
Making multistream variable duration work for both the float and int APIexp_analysis9
Diffstat (limited to 'src/opus_multistream_encoder.c')
| -rw-r--r-- | src/opus_multistream_encoder.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/opus_multistream_encoder.c b/src/opus_multistream_encoder.c index c2b47a31..bdd00fbf 100644 --- a/src/opus_multistream_encoder.c +++ b/src/opus_multistream_encoder.c @@ -189,6 +189,9 @@ static int opus_multistream_encode_native int frame_size, unsigned char *data, opus_int32 max_data_bytes +#ifndef FIXED_POINT + , downmix_func downmix +#endif ) { opus_int32 Fs; @@ -225,7 +228,7 @@ static int opus_multistream_encode_native delay_compensation -= Fs/400; #ifndef FIXED_POINT LM = optimize_framesize(pcm, frame_size, channels, Fs, st->bitrate_bps, - 0.f, st->subframe_mem, delay_compensation); + 0.f, st->subframe_mem, delay_compensation, downmix); #endif while ((Fs/400<<LM)>frame_size) LM--; @@ -414,7 +417,7 @@ int opus_multistream_encode_float ) { return opus_multistream_encode_native(st, opus_copy_channel_in_float, - pcm, frame_size, data, max_data_bytes); + pcm, frame_size, data, max_data_bytes, downmix_float); } int opus_multistream_encode( @@ -426,7 +429,7 @@ int opus_multistream_encode( ) { return opus_multistream_encode_native(st, opus_copy_channel_in_short, - pcm, frame_size, data, max_data_bytes); + pcm, frame_size, data, max_data_bytes, downmix_int); } #endif |