Commit 22bc0eb0 authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

Merge branch 'basop-2642-possible-bug-in-function-ivas_calculate_abs_fr' into 'main' 

Resolve "Possible bug in function ivas_calculate_abs_fr()"

Closes #2642

See merge request !3091
parents f51f2c58 05377868

lib_com/ivas_fb_mixer_fx.c

+5 −0
Original line number Diff line number Diff line
@@ -1165,7 +1165,12 @@ static Word16 ivas_calculate_abs_fr_fx( 


    FOR( i = 0; i < frame_len; i++ )

    {

#ifdef FIX_BASOP_2642_INCORRECT_IF_THRESHOLD

        test();

        if ( LT_32( ppFilterbank_FRs_s_fx[i], 419430 ) )

#else

        if ( ppFilterbank_FRs_s_fx[i] < 0 )

#endif

        {

            ppFilterbank_FRs_s_fx[i] = 419430; // 0.1 in Q22

            move32();

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ 
#define FIX_FLOAT_1600_OMASA_WRONG_RENDER_PATH          /* Nokia: float issue 1600: fix initialization condition of stereo type detection for OMASA */

#define FIX_BASOP_2627_PARAM_MC_ILD_REMAP_EXP           /* FhG: BASOP #2627: accumulate 10^(ILD/10) using a dynamic exponent */

#define FIX_BASOP_2635_EFAP_ADD_VERTEX_ELE_ROUND        /* FhG: BASOP #2635: round |elevation| with anint_fx before the 90deg subtraction in add_vertex_fx */

#define FIX_BASOP_2642_INCORRECT_IF_THRESHOLD           /* Dolby: BASOP #2642: incorrect threshold 0.0 used instead of 0.1 in if condition */

#define FIX_BASOP_2639_INCORRECT_ARRAY_INDEX            /* Dolby: BASOP #2639: incorrect array index in ivas_spar_unquant_dtx_indicies */

#define FIX_BASOP_2640_MASA_STEREO_TYPE_ASSERT          /* Nokia: BASOP issue 2640: Fix assert by saturating shift when exponent difference is very large. */

#define FIX_2636_OMASA_INTERFORMAT_BRATE                /* VA: basop issue 2636: Correct condition in function ivas_interformat_brate_fx() */