Commit c8ca64fd authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch '807-masa-dtx-bitrate-switching-on-long-test-vector' into 'ivas-float-update' 

MASA DTX in bitrate switching

See merge request !447
parents 660c4129 e7f7ad97

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ 
#define NON_BE_FIX_1137_GSC_IVAS_FXFLT_DECODING         /* VA: Add fix point bit allocation for special GSC mode such that float and fixed point have the same final bit allocation */

#define NONBE_FIX_1132_THRESHOLD_POW_IN_SWB_TBE         /* VA: issue 1132: prevent division by extremely low energy value in SWB TBE */



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

/* #################### End FIXES switches ############################ */



#define BASOP_NOGLOB                                    /* Disable global symbols in BASOPs, Overflow/Carry in BASOPs disabled, additional BASOPs in case of Overflow */

lib_dec/acelp_core_dec.c

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

+4 −1
Original line number Diff line number Diff line
@@ -371,8 +371,11 @@ 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 );