Commit ab5fe956 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_MCT_UNINIT_MEM

parent ef0b63de

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -148,7 +148,6 @@ 
#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 SBA_BR_SWITCHING                                /* Issue 114: Changes for sba bit rate switching*/

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

#define FIX_MCT_UNINIT_MEM                              /* Issue 166: Reading of uninitialized memory in TCX range coder */

#define FIX_IGF_NOISE_REPETITION                        /* Issue 182: fix repetition of same noise in IGF */

#define FIX_126_MDFT_FB_STATIC_MEM                      /* Issue 126: reduce static mem consumption of the MDFT FB for non-SBA formats */

#define FIX_I214_CLIPPING_STANDALONE_REND               /* Issue 214: TD standalone renderer does not handle clipping */

lib_enc/ivas_mdct_core_enc.c

+0 −8
Original line number Diff line number Diff line
@@ -881,11 +881,7 @@ void ivas_mdct_core_whitening_enc( 
        {

            chE_tot = sum_f( chE, NB_DIV );



#ifdef FIX_MCT_UNINIT_MEM

            if ( chE_tot < SILENT_CHANNEL_THRES && nSubframes == 1 )

#else

            if ( chE_tot < SILENT_CHANNEL_THRES )

#endif

            {

                st->mct_chan_mode = MCT_CHAN_MODE_IGNORE;

                st->bits_frame_channel = 0;
@@ -1059,11 +1055,7 @@ void ivas_mdct_core_whitening_enc( 
        {

            st->side_bits_frame_channel = 0;

            /*dummy initialization to prevent range coder crashing in case all channels are silent and bits are distributed to channel 0 */

#ifdef FIX_MCT_UNINIT_MEM

            *p_param[ch] = 1 + NOISE_FILL_RANGES + LTPSIZE + tnsSize[ch][0] + NPRM_CTX_HM;

#else

            *p_param[ch] = 9;

#endif

            continue;

        }