Commit 9579701a authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch... 

Merge branch '1206-mct-missing-zeroing-out-of-buffer-when-channel-mode-is-mct_chan_mode_ignore' into 'main'

[non-be] Resolve "MCT: missing zeroing-out of buffer when channel mode is MCT_CHAN_MODE_IGNORE"

See merge request !1827
parents 2d4e5268 b55de9cf

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ 
#define NONBE_FIX_1197_OMASA_META_BUFFER                /* Nokia: OMASA ISM_MASA_MODE_PARAM_ONE_OBJ history zero in rateswitching */



#define FIX_1139_REV_COLORATION_SHORT_T60               /* Nokia,FhG: Fix issue 1139, prevent sound coloration artefacts at very low reverberation times */

#define FIX_1206_ZERO_OUT_IMDCT_BUFFERS_FOR_MCT_IGNORE  /* FhG: zero out all relevant imdct buffers in MCT decoding of channels with mct_chan_mode == MCT_CHAN_MODE_IGNORE */



/* ##################### End NON-BE switches ########################### */

lib_dec/ivas_mdct_core_dec.c

+9 −0
Original line number Diff line number Diff line
@@ -865,6 +865,15 @@ void ivas_mdct_core_reconstruct( 
                {

                    set_f( &synth[k * L_frame[ch]], 0.f, L_frame[ch] );

                    set_f( &synthFB[k * L_frame[ch]], 0.f, L_frameTCX[ch] );

#ifdef FIX_1206_ZERO_OUT_IMDCT_BUFFERS_FOR_MCT_IGNORE

                    /* Note: these buffers are not subframe-based, hence no indexing with k */

                    set_f( &st->hHQ_core->old_outLB[0], 0.f, L_frame[ch] );

                    set_f( &st->hHQ_core->old_out[0], 0.f, L_frameTCX[ch] );

                    set_f( &st->hTcxDec->syn_Overl[0], 0.f, L_frame[ch] / 2 );

                    set_f( &st->hTcxDec->syn_OverlFB[0], 0.f, L_frameTCX[ch] / 2 );

                    set_f( &st->hTcxDec->syn_Overl_TDAC[0], 0.f, L_frame[ch] / 2 );

                    set_f( &st->hTcxDec->syn_Overl_TDACFB[0], 0.f, L_frameTCX[ch] / 2 );

#endif

                }

            }