eden-emu/opus
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disables all the surround mode forcing for mono/stereo

Browse source
This commit is contained in:
Jean-Marc Valin 2013-05-27 20:47:47 -04:00
parent fcecd29abf
commit 58d80ab9ea
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/opus_multistream_encoder.c
View file

@ -189,7 +189,7 @@ static int opus_multistream_encoder_init_impl(
if(ret!=OPUS_OK)return ret; if(ret!=OPUS_OK)return ret;
ptr += align(mono_size); ptr += align(mono_size);
} }
if (surround && st->layout.nb_channels>2) if (surround)
{ {
OpusEncoder *downmix_enc; OpusEncoder *downmix_enc;
downmix_enc = (OpusEncoder*)ptr; downmix_enc = (OpusEncoder*)ptr;
@ -258,7 +258,8 @@ int opus_multistream_surround_encoder_init(
mapping[i] = i; mapping[i] = i;
} else } else
return OPUS_UNIMPLEMENTED; return OPUS_UNIMPLEMENTED;
opus_multistream_encoder_init_impl(st, Fs, channels, *streams, *coupled_streams, mapping, application, 1); opus_multistream_encoder_init_impl(st, Fs, channels, *streams, *coupled_streams,
mapping, application, channels>2&&mapping_family==1);
return OPUS_OK; return OPUS_OK;
} }
@ -496,7 +497,7 @@ static int opus_multistream_encode_native
coupled_size = opus_encoder_get_size(2); coupled_size = opus_encoder_get_size(2);
mono_size = opus_encoder_get_size(1); mono_size = opus_encoder_get_size(1);
if (st->surround && st->layout.nb_channels>2) if (st->surround)
{ {
int i; int i;
unsigned char dummy[512]; unsigned char dummy[512];