Commit 80a428f4 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch '870-mdct-stereo-dtx-with-mono-output-clicks-in-dtx-active-transitions' into 'main' 

[non-BE] Resolve "MDCT-Stereo DTX with mono output: clicks in DTX -> active transitions"

See merge request !1173
parents 25318aa5 5eb7ef44

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ 
#define NONBE_FIX_861_MASA_CRASH_STEREO_SWITCHING             /* VA: issue 861: fix MASA 2TC crash when switching from MDCT stereo to TD/DFT stereo */

#define BE_FIX_867_PARAMC_RECONFIG                            /* FhG: issue #867: fix ParamMC CLDFB buffer dealloc when reconfiguring */

#define NONBE_FIX_850_MASA_HBR_META_RATIO_DECODING            /* Nokia: issue #850: Fixes rare non-valid diffuseness and energy ratio values in 2dir MASA. */



#define NONBE_FIX_MDCT_STEREO_DTX_MONO_OUT                    /* FhG: fix clicks in DTX -> active transition frames in MDCT-Stereo with mono output */



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

lib_dec/ivas_stereo_switching_dec.c

+7 −0
Original line number Diff line number Diff line
@@ -1302,6 +1302,13 @@ void synchro_synthesis( 
            }

        }



#ifdef NONBE_FIX_MDCT_STEREO_DTX_MONO_OUT

        if ( hCPE->element_mode == IVAS_CPE_MDCT && hCPE->nchan_out == 1 && !is_DTXrate( hCPE->element_brate ) && is_DTXrate( hCPE->last_element_brate ) )

        {

            mvr2r( sts[0]->prev_synth_buffer, sts[1]->prev_synth_buffer, delay_comp_TD );

        }

#endif



        nChannels = ( hCPE->element_mode == IVAS_CPE_MDCT ) ? 2 : hCPE->nchan_out;

        for ( n = 0; n < nChannels; n++ )

        {