Commit 4db15d88 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Fix BASOP issue 2525 by correction assignment

parent a8ff39cd

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ 
#define FIX_BASOP_2513_EXTRA_RETURN_REND_OPEN           /* Nokia: BASOP issue 2513: Removes extra return block */

#define FIX_BASOP_2514_EFAP_PORTING_ERROR               /* Nokia: BASOP issue 2514: Fix wrongly ported line */

#define FIX_BASOP_2516_REND_CUSTOM_LAYOUT_PORT_BUG      /* Nokia: BASOP issue 2516: Fix porting bug in setting planar state for custom layout in renderer */

#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
@@ -3982,7 +3982,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();

                }