Commit f4c2831a authored by multrus's avatar multrus
Browse files

Merge branch '1369-basop-assert-in-hq_lr_enc' into 'main' 

Resolve "BASOP-Assert in hq_lr_enc()"

See merge request !2217
parents f26a9821 46912cc8

lib_com/options.h

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

#define TMP_FIX_1119_SPLIT_RENDERING_VOIP               /* FhG: Add error check for unsupported config: split rendering with VoIP mode */

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

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



/* #################### End BE switches ################################## */

lib_enc/hq_lr_enc.c

+9 −1
Original line number Diff line number Diff line
@@ -336,7 +336,15 @@ 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 ) );

    }