From fa5156838319602479d5af916785adb991570cc1 Mon Sep 17 00:00:00 2001 From: Jean-Marc Valin Date: Wed, 25 Sep 2019 01:16:16 -0400 Subject: Use new waveform matching option on ambisonics Should reduce phase-related problems at low bitrate --- src/opus_multistream_encoder.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/opus_multistream_encoder.c b/src/opus_multistream_encoder.c index 93204a14..302ffe86 100644 --- a/src/opus_multistream_encoder.c +++ b/src/opus_multistream_encoder.c @@ -475,6 +475,8 @@ static int opus_multistream_encoder_init_impl( if(ret!=OPUS_OK)return ret; if (i==st->lfe_stream) opus_encoder_ctl((OpusEncoder*)ptr, OPUS_SET_LFE(1)); + if (mapping_type == MAPPING_TYPE_AMBISONICS) + opus_encoder_ctl((OpusEncoder*)ptr, OPUS_SET_WAVEFORM_MATCHING(1)); ptr += align(coupled_size); } for (;ilayout.nb_streams;i++) @@ -482,6 +484,8 @@ static int opus_multistream_encoder_init_impl( ret = opus_encoder_init((OpusEncoder*)ptr, Fs, 1, application); if (i==st->lfe_stream) opus_encoder_ctl((OpusEncoder*)ptr, OPUS_SET_LFE(1)); + if (mapping_type == MAPPING_TYPE_AMBISONICS) + opus_encoder_ctl((OpusEncoder*)ptr, OPUS_SET_WAVEFORM_MATCHING(1)); if(ret!=OPUS_OK)return ret; ptr += align(mono_size); } -- cgit v1.2.3