Commit bab7bc15 authored by fotopoulou's avatar fotopoulou
Browse files

Merge branch 'ivas-float-update' into fix-issue-812-nan-cohsnr

parents 5cff117a c8ca64fd

lib_com/options.h

+3 −1
Original line number Diff line number Diff line
@@ -71,8 +71,10 @@ 
#define NONBE_MDCT_ST_DTX_SKIP_DEWHITENING_OF_NOISE_SHAPES_ON_SID_FRAMES /* FhG: issue 1133: skip de-whitening of bg noise shape after frameloss period if the first good frame is an SID */

#define NONBE_MDCT_ST_PLC_DO_NOT_SCALE_OLD_OUT_IF_FIRST_GOOD_IS_SID /* FhG: issue 1133: in TCX PLC, don't scale hHQ_core->old_out after applying fade to noise in burst frame error */

#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 FIX_BASOP_812_NAN_COHSNR                        /* FhG: BASOP issue 812: fix nan values in sparse frames for cohSNR value in ITD estimation*/



#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_dec/swb_tbe_dec.c

+18 −0
Original line number Diff line number Diff line
@@ -325,6 +325,15 @@ void wb_tbe_dec( 
        prev_pow = sum2_f( shaped_wb_excitation, L_SHB_LAHEAD / 4 );

        curr_pow = sum2_f( shaped_wb_excitation + L_SHB_LAHEAD / 4, L_SHB_LAHEAD / 4 );



#ifdef NONBE_FIX_1132_THRESHOLD_POW_IN_SWB_TBE

        if ( st->element_mode > EVS_MONO )

        {

            /* prevent too low values of energy */

            prev_pow = max( 0.00001f, prev_pow );

            curr_pow = max( 0.00001f, curr_pow );

        }

#endif



        if ( voice_factors[0] > 0.75f )

        {

            curr_pow *= 0.25;
@@ -1059,6 +1068,15 @@ void swb_tbe_dec( 
        prev_pow = sum2_f( shaped_shb_excitation, L_SHB_LAHEAD + 10 );

        curr_pow = sum2_f( shaped_shb_excitation + L_SHB_LAHEAD + 10, L_SHB_LAHEAD + 10 );



#ifdef NONBE_FIX_1132_THRESHOLD_POW_IN_SWB_TBE

        if ( st->element_mode > EVS_MONO )

        {

            /* prevent too low values of energy */

            prev_pow = max( 0.00001f, prev_pow );

            curr_pow = max( 0.00001f, curr_pow );

        }

#endif



        if ( voice_factors[0] > 0.75f )

        {

            curr_pow *= 0.25;

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 );

lib_enc/swb_tbe_enc.c

+18 −0
Original line number Diff line number Diff line
@@ -373,6 +373,15 @@ void wb_tbe_enc( 
    prev_pow = sum2_f( shaped_wb_excitation, L_SHB_LAHEAD / 4 );

    curr_pow = sum2_f( shaped_wb_excitation + L_SHB_LAHEAD / 4, L_SHB_LAHEAD / 4 );



#ifdef NONBE_FIX_1132_THRESHOLD_POW_IN_SWB_TBE

    if ( st->element_mode > EVS_MONO )

    {

        /* prevent too low values of energy */

        prev_pow = max( 0.00001f, prev_pow );

        curr_pow = max( 0.00001f, curr_pow );

    }

#endif



    if ( voice_factors[0] > 0.75f )

    {

        curr_pow = (float) ( curr_pow * 0.25 );
@@ -1050,6 +1059,15 @@ void swb_tbe_enc( 
        prev_pow = sum2_f( shaped_shb_excitation, L_SHB_LAHEAD + 10 );

        curr_pow = sum2_f( shaped_shb_excitation + L_SHB_LAHEAD + 10, L_SHB_LAHEAD + 10 );



#ifdef NONBE_FIX_1132_THRESHOLD_POW_IN_SWB_TBE

        if ( st->element_mode > EVS_MONO )

        {

            /* prevent too low values of energy */

            prev_pow = max( 0.00001f, prev_pow );

            curr_pow = max( 0.00001f, curr_pow );

        }

#endif



        if ( voice_factors[0] > 0.75f )

        {

            curr_pow = (float) ( curr_pow * 0.25 );