Commit 0a594b7d authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge branch 'basop-2510-seemingly-debug-assert-0-in-initdiffuseresponses_fx' into 'main' 

Resolve "Seemingly debug "assert(0)" in initDiffuseResponses_fx"

Closes #2510

See merge request !2934
parents efc1fc02 4e2cf8b8

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ 
#define FIX_BASOP_2526_SPAR_MASA_PARAM_MAP_Q_BUG        /* Nokia: BASOP issue 2526: Fix wrong Q variable in SPAR to MASA param mapping */

#define FIX_BASOP_2524_MASA_REDUCE_META_BUG             /* Nokia: BASOP issue 2524: Fix wrong reset of W_tmp in reduce_metadata_further_fx */

#define FIX_BASOP_2520_PARAMBIN_THRESHOLD_FIX           /* Nokia: BASOP issue 2520: Fix wrong threshold in ParamBin */

#define FIX_BASOP_2510_UNNECESSARY_ASSERT               /* Nokia: BASOP issue 2510: Fix by removing assert */



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

lib_rend/ivas_dirac_rend_fx.c

+2 −0
Original line number Diff line number Diff line
@@ -1252,8 +1252,10 @@ void initDiffuseResponses_fx( 
                    move16();

                    Word16 num_horizontal_speakers_isq = ISqrt16( num_horizontal_speakers, &exp_var1 );   // q15-exp_var1

                    num_horizontal_speakers_isq = shr( num_horizontal_speakers_isq, negate( exp_var1 ) ); // q15

#ifndef FIX_BASOP_2510_UNNECESSARY_ASSERT

                    assert( 0 );

                    /*No stream hitting*/

#endif

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

                    {

                        diffuse_response_function_fx[i] = mult( diffuse_response_function_fx[i], num_horizontal_speakers_isq ); // q15