Commit 028ad468 authored by multrus's avatar multrus
Browse files

Merge branch 'basop-2522-potential-porting-bug-in-map_params_dirac_to_stereo' into 'main' 

[non-BE][allow-regression] Resolve "Potential porting bug in map_params_dirac_to_stereo"

Closes #2522

See merge request !2936
parents cabc90ba d5a92a1b

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ 
#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 */

#define FIX_2515_TDREND_PORT_ERROR_SCALING              /* Nokia: BASOP issue 2515: Fix port error by changing to correct scaling */

#define FIX_BASOP_2522_MAP_PARAMS_DIRAC_STEREO          /* FhG: BASOP issue 2522: Fix copy and paste error for side_gain calculation in map_params_dirac_to_stereo() */



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

lib_dec/ivas_sba_dirac_stereo_dec_fx.c

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

            IF( q_sqrt )

            {

#ifdef FIX_BASOP_2522_MAP_PARAMS_DIRAC_STEREO

                side_gain[b + STEREO_DFT_BAND_MAX] = L_shl( side_gain[b + STEREO_DFT_BAND_MAX], q_sqrt ); /*Q31*/

#else

                side_gain[b + STEREO_DFT_BAND_MAX] = L_shl( side_gain[b], q_sqrt ); /*Q31*/

#endif

                q_sqrt = 0;

                move16();

            }