Commit d159f1e5 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_971_LOG2_IDX_GAIN_0

parent 1a387b9f

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -153,7 +153,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#define FIX_971_LOG2_IDX_GAIN_0                         /* VA: prevent -Inf due to log2(ratio==0) */

#define FIX_ACCESS_WITHIN_NULL_STRUCT_MC_BW_SWITCHING   /* FhG: fix usan error in MCT with bw swicthing */

#define FIX_966_VAR_OVERFLOW_IN_HARM_MODEL_ARI          /* FhG: fix and undef behaviour bug in the harmonic TCX model arithmetic coder */

#define FIX_983_DISC_ISM_DIGEST_NUM_OBJS                /* FhG: issue #983: the discrete ISM digest function uses the wrong number of objects */

lib_enc/swb_tbe_enc.c

+0 −2
Original line number Diff line number Diff line
@@ -2738,12 +2738,10 @@ void fb_tbe_enc( 
    hBWE_TD->prev_fb_energy = sum2_f( input_fhb + L_FRAME48k / 2, L_FRAME48k / 2 );

    fb_exc_energy = sum2_f( fb_exc, L_FRAME16k ) + EPSILON;

    ratio = (float) sqrt( temp2 / fb_exc_energy );

#ifdef FIX_971_LOG2_IDX_GAIN_0

    if ( ratio < 1.0f )

    {

        ratio = 1.0f;

    }

#endif

    idxGain = (int16_t) ( log2_f( (float) ratio ) + 0.5f );

    idxGain = max( 0, min( 15, idxGain ) );

    ratio = (float) ( 1 << idxGain );