Commit bf74e7d6 authored by malenov's avatar malenov
Browse files

cleanup NON_BE_FIX_807_MASA_DTX_BRSW

parent 68f098c2

lib_com/options.h

+0 −2
Original line number Diff line number Diff line
@@ -142,8 +142,6 @@ 


/* ################### Start FIXES switches ########################### */





#define NON_BE_FIX_807_MASA_DTX_BRSW                     /* Nokia: adds fix to check existence of DTX encoder for secondary channel in TD mode */

#define NON_BE_FIX_BASOP_819_THRESHOLD_MASA2TOTAL        /* Nokia: add fix for precision limitation in comparison with masa2total energy ratio threshold */

#define FIX_828_PORT_1152_FROM_FLT_REPO                  /* FhG: fix for issue 828 - fix uninitialized value used in BASOP */

#define NONE_BE_FIX_816_LFE_PLC_FLOAT                   /* DLB: issue 816: reduce required precision to float for LFE-PLC*/

lib_dec/acelp_core_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -231,11 +231,7 @@ ivas_error acelp_core_dec( 
        st->hGSCDec->Last_frame_ener = (float) MAX_32;

    }



#ifdef NON_BE_FIX_807_MASA_DTX_BRSW

    if ( st->hFdCngDec != NULL && ( st->element_mode == IVAS_CPE_DFT || st->element_mode == IVAS_CPE_TD ) && ( st->last_core_brate == SID_2k40 || st->last_core_brate == FRAME_NO_DATA ) )

#else

    if ( ( st->element_mode == IVAS_CPE_DFT || st->element_mode == IVAS_CPE_TD ) && ( st->last_core_brate == SID_2k40 || st->last_core_brate == FRAME_NO_DATA ) )

#endif

    {

        set_zero( st->hFdCngDec->hFdCngCom->olapBufferSynth2, FFTLEN );

        set_zero( hStereoCng->olapBufferSynth22, FFTLEN );

lib_enc/acelp_core_enc.c

+0 −4
Original line number Diff line number Diff line
@@ -378,11 +378,7 @@ ivas_error acelp_core_enc( 
        /*-----------------------------------------------------------------*

         * After inactive period, use the most up-to-date ISPs

         *-----------------------------------------------------------------*/

#ifdef NON_BE_FIX_807_MASA_DTX_BRSW

        if ( st->hDtxEnc != NULL && ( st->last_core_brate == FRAME_NO_DATA || st->last_core_brate == SID_2k40 ) )

#else

        if ( st->last_core_brate == FRAME_NO_DATA || st->last_core_brate == SID_2k40 )

#endif

        {

            mvr2r( st->hDtxEnc->lspCNG, st->lsp_old, M );

            lsp2lsf( st->hDtxEnc->lspCNG, st->lsf_old, M, int_fs );