Commit 3e9e7610 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_738_SBA_BR_SW_ASAN

parent 34a18965

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -177,7 +177,6 @@ 


#define NONBE_FIX_787_PARAM_UPMIX_LEVEL                       /* Dlb: issue 787: fix level of Mono/Stereo for ParamUpmix mode */



#define NONBE_FIX_738_SBA_BR_SW_ASAN                          /* FhG: issue 738: fixes bug when switching to an MCT bitrate and previous frame was ACELP */

#define NONBE_CR_FIX_735_SBA_HP20_BRATE_SWITCHING             /* VA: Issue 735: Resolve "HP20 filtering bug in SBA/OSBA bitrate switching" */

#define NONBE_FIX_588_UPDATE_FASTCONV_SD                      /* FhG: issue 588: update FastConv SD HRTFs in CLDFB domain with new conversion method */

#define NONBE_FIX_774_OSBA_MONO_DEC_CRASH                     /* FhG: issue 774: decoder crash for OSBA to mono */

lib_enc/ivas_mct_core_enc.c

+0 −4
Original line number Diff line number Diff line
@@ -337,13 +337,11 @@ void ivas_mct_core_enc( 
        }

        nSubframes = ( sts[ch]->hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV;

        L_subframeTCX = sts[ch]->hTcxEnc->L_frameTCX / nSubframes;

#ifdef NONBE_FIX_738_SBA_BR_SW_ASAN

        /* in MCT only relevant for bitrate switching from non-MCT bitrates */

        if ( sts[ch]->last_core == ACELP_CORE )

        {

            L_subframeTCX += L_subframeTCX / 4;

        }

#endif



        for ( n = 0; n < nSubframes; n++ )

        {
@@ -394,13 +392,11 @@ void ivas_mct_core_enc( 
        }

        nSubframes = ( st->hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV;

        L_subframeTCX = st->hTcxEnc->L_frameTCX / nSubframes;

#ifdef NONBE_FIX_738_SBA_BR_SW_ASAN

        /* in MCT only relevant for bitrate switching from non-MCT bitrates */

        if ( st->last_core == ACELP_CORE )

        {

            L_subframeTCX += L_subframeTCX / 4;

        }

#endif



        if ( ( st->hTcxEnc->tcxMode == TCX_20 ) && ( st->total_brate < HQ_96k || st->igf ) )

        {