Commit 55f80b70 authored by malenov's avatar malenov
Browse files

cleanup NONBE_FIX_1132_THRESHOLD_POW_IN_SWB_TBE

parent e3ffe22e

lib_com/options.h

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


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



#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 */

lib_dec/swb_tbe_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -328,14 +328,12 @@ 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 )

        {
@@ -1072,14 +1070,12 @@ 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 )

        {

lib_enc/swb_tbe_enc.c

+0 −4
Original line number Diff line number Diff line
@@ -376,14 +376,12 @@ 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 )

    {
@@ -1063,14 +1061,12 @@ 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 )

        {