Commit 38de434b authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_MCT_PLC_RECOVERY

parent 2b7e131c

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -146,7 +146,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define FIX_I1_113                                      /* under review : MCT bit distribution optimization for SBA high bitrates*/

#define FIX_124_DONT_ALLOC_PLCINFO_IN_IVAS              /* Issue 124: do not allocate unused plc struct in IVAS modes which is only used in EVS mono */

#define FIX_MCT_PLC_RECOVERY                            /* Issue 184: scale the old synthesis part correctly in the first good frame after lost frames in MCT modes - to be activated after previous switch is merged */

#define SBA_BR_SWITCHING                                /* Issue 114: Changes for sba bit rate switching*/

#define FIX_AGC_WINFUNC_MEMORY                          /* Issue 62: lower agc_com.winFunc memory consumption */

#define FIX_ITD                                         /* Contribution 16: TD renderer ITD improvement and code cleanup */

lib_dec/ivas_core_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -182,11 +182,7 @@ ivas_error ivas_core_dec( 
        }



#ifdef FIX_124_DONT_ALLOC_PLCINFO_IN_IVAS

#ifdef FIX_MCT_PLC_RECOVERY

        if ( !st->bfi && st->prev_bfi && ( st->last_core_bfi == TCX_20_CORE || st->last_core_bfi == TCX_10_CORE ) && st->hTcxDec != NULL )

#else

        if ( !st->bfi && st->prev_bfi && ( st->last_core_bfi == TCX_20_CORE || st->last_core_bfi == TCX_10_CORE ) && st->hTcxDec != NULL && hMCT == NULL )

#endif

        {

            float gain;