Commit 19757e34 authored by multrus's avatar multrus
Browse files

merge from main

parents 67d612bf 82b46990

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -145,12 +145,13 @@ 
#ifdef SBA_BR_SWITCHING

#define SBA_BR_SWITCHING_RECONFIG                       /* Issue 114: Changes for SBA bitrate switching with reconfiguration for bitrates with different number of transport channels*/

#endif



#define FIX_FIX_I59                                     /* Issue 59:  small fix concerning LFE delay rounding */

#define HRTF_BINARY_FILE                                /* HRTF filters' binary file used for binaural rendering. */



#define FIX_197_CREND_INTERFACE 

#define FIX_FOR_TEST                                    /* allows tests to pass using old TD binary file, to be removed after merge*/



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





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

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;