Commit 1c0fab3a authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

Merge branch 'basop-2639-critical-mismatch-in-function-ivas_spar_unquant_dtx_indicies' into 'main' 

Resolve "Critical mismatch In function ivas_spar_unquant_dtx_indicies()"

Closes #2639

See merge request !3085
parents f122e999 d1a34060

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,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_2639_INCORRECT_ARRAY_INDEX            /* Dolby: BASOP #2639: incorrect array index in ivas_spar_unquant_dtx_indicies */



/* ##################### End NON-BE switches ########################### */

lib_dec/ivas_spar_md_dec_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -2618,7 +2618,11 @@ static void ivas_spar_unquant_dtx_indicies( 
            move32();

        }



#ifdef FIX_BASOP_2639_INCORRECT_ARRAY_INDEX

        FOR( i = 0; i < ( FOA_CHANNELS - ndm_per_band[( bw * b )] ); i++ )

#else

        FOR( i = 0; i < ( FOA_CHANNELS - ndm_per_band[( bw - b )] ); i++ )

#endif

        {

            q_lvl = dtx_pd_real_q_levels[( ndm_per_band[( bw * b )] - 1 )][i]; /*Q0*/

            move16();