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

Merge branch 'basop-2525-porting-error-in-ivas_merge_masa_metadata_fx' into 'main' 

[non-BE] Resolve "Porting error in ivas_merge_masa_metadata_fx"

Closes #2525

See merge request !2939
parents 9b5daaf1 a59edaf0

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ 
#define FIX_2505_IVAS_DEC_SEGFAULT                      /* FhG: BASOP #2505: Add headroom to input of ivas_rend_crendProcessSubframe_fx() for ivas_mdft_fx() calculation */

#define HARMONIZE_DoRTFTn                               /* VA: harmonize functions DoRTFTn_fx() and DoRTFTn_fx_ivas() */

#define FIX_BASOP_2529_MASA_RATIO_SCALINGS              /* Nokia: BASOP issue 2529: Fix MASA ratio scalings and verifications */

#define FIX_BASOP_2525_MASA_MERGE_WRONG_ASSIGN          /* Nokia: BASOP issue 2525: Fix wrong assignment in MASA merge code */



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

lib_enc/ivas_masa_enc_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -4010,7 +4010,11 @@ void ivas_merge_masa_metadata_fx( 
                    direct_scaler_e = 0;

                    move16();

                    hMeta->directional_meta[0].energy_ratio_fx[sf][band] = Mpy_32_32( direct_scaler_fx, hMeta->directional_meta[0].energy_ratio_fx[sf][band] ); /*q30*/

#ifdef FIX_BASOP_2525_MASA_MERGE_WRONG_ASSIGN

                    hMeta->directional_meta[1].energy_ratio_fx[sf][band] = Mpy_32_32( direct_scaler_fx, hMeta->directional_meta[1].energy_ratio_fx[sf][band] ); /*q30*/

#else

                    hMeta->directional_meta[1].energy_ratio_fx[sf][band] = Mpy_32_32( direct_scaler_fx, hMeta->directional_meta[0].energy_ratio_fx[sf][band] ); /*q30*/

#endif

                    move32();

                    move32();

                }