Commit 02fc63c1 authored by Jan Kiene's avatar Jan Kiene
Browse files

add witch for fixing MCT PLC recovery - still inactive

parent b569f2af

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 


#ifdef DEBUGGING



/*#define MEM_COUNT_DETAILS*/                   /* RAM counting tool: print per sub-structure details */

#define MEM_COUNT_DETAILS                   /* RAM counting tool: print per sub-structure details */



/*#define DEBUG_MODE_INFO*/                     /* output most important parameters to the subdirectory "res/" */

#ifdef DEBUG_MODE_INFO
@@ -154,6 +154,7 @@ 
#define FIX_TCX_DEC_RECONF_BFI

#define FIX_SBA_DTX_DECODE_ERROR                        /* Issue 176: SBA decoder error with DTX at 80kbps SWB, Issue 21: SBA front-VAD threshold (203) */

#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 */



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

/* clang-format on */

lib_dec/ivas_core_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -182,7 +182,11 @@ 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;