Commit 6bcd2667 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1369_HQ_LR_OVERFLOW

parent 308cadad

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -159,7 +159,6 @@ 
#define FIX_1129_EXT_REND_OUTPUT_HIGH                   /* Philips: issue 1129: External renderer BINAURAL_ROOM_REVERB format output level too high compared to internal rendering output */

#define NONBE_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */

#define FIX_1113_CLDFB_REND_IN_ISAR                     /* issue 1113: fix the use of CLDFB renderer in split-rendering at the external renderer */

#define FIX_1369_HQ_LR_OVERFLOW                         /* FhG: fix BASOP overflow in hq_lr_enc(), brings floating-point code inline with FX */

#define NONBE_1118_EVS_LR_HQ_BITERROR                   /* VA: issue 1118: fix EVS decoder crash in LR-HQ in case of bit errors */

#define FIX_1139_REV_COLORATION_SHORT_T60               /* Nokia,FhG: Fix issue 1139, prevent sound coloration artefacts at very low reverberation times */

lib_enc/hq_lr_enc.c

+0 −4
Original line number Diff line number Diff line
@@ -334,14 +334,10 @@ void hq_lr_enc( 
        frac1 = L_Extract_lc( L_tmp, &exp ); /* Extract exponent of L_tmp */

        L_tmp = Pow2( 30, frac1 );

        exp = sub( exp, 30 );

#ifdef FIX_1369_HQ_LR_OVERFLOW

#ifdef BASOP_NOGLOB

        Ep_fx[i] = L_shl_o( L_tmp, s_max( sub( exp, 6 ), -31 ), &Overflow ); /* Q -6 */

#else

        Ep_fx[i] = L_shl( L_tmp, s_max( sub( exp, 6 ), -31 ) ); /* Q -6 */

#endif

#else

        Ep_fx[i] = L_shl( L_tmp, sub( exp, 6 ) ); /* Q -6 */

#endif

        Ep[i] = (float) ( Ep_fx[i] / pow( 2.0, -6 ) );

    }