Commit 82b46990 authored by fotopoulou's avatar fotopoulou
Browse files

Merge branch '301-click-in-dft-stereo-plc-24-4kbps' into 'main' 

[non-BE] fix for issue 301 fix bug of missing update of overlap buffer for DFT-stereo PLC under FIX_301_PLC

See merge request !422
parents 086afc6f adb20e90

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ 
#define FIX_309_PREMPH_MEM_SCE                          /* FhG: issue 309 - fix overwriting of mem_preemph_enc in ivas preprocessing for SCE and tcxonly modes*/



#define FIX_317                                         /* FhG: issue 317 - address sanitizer error in MDCT-Stereo PLC */



#define FIX_301_PLC                                     /* FhG: issue 301 - fix bug of missing update of overlap buffer for DFT-stereo PLC*/



/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

lib_dec/core_dec_init.c

+4 −0
Original line number Diff line number Diff line
@@ -279,7 +279,11 @@ void open_decoder_LPD( 
            st->last_core_bfi = ACELP_CORE;

        }



#ifdef FIX_301_PLC

        if ( ( ( st->element_mode != IVAS_CPE_DFT ) || ( st->element_mode == IVAS_CPE_DFT && st->prev_bfi ) ) && st->last_codec_mode == MODE1 && st->last_core == ACELP_CORE )

#else

        if ( st->element_mode != IVAS_CPE_DFT && st->last_codec_mode == MODE1 && st->last_core == ACELP_CORE )

#endif

        {

            /* Switching from Mode 1 ACELP */

            st->last_core_bfi = ACELP_CORE;