From 4db15d88ce0ceffa09d455f9bc94bdb4f12ffa48 Mon Sep 17 00:00:00 2001 From: Tapani Pihlajakuja Date: Sat, 11 Apr 2026 22:24:24 +0300 Subject: [PATCH] Fix BASOP issue 2525 by correction assignment --- lib_com/options.h | 1 + lib_enc/ivas_masa_enc_fx.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index 8d06feb49..9708bd270 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -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 ########################### */ diff --git a/lib_enc/ivas_masa_enc_fx.c b/lib_enc/ivas_masa_enc_fx.c index 8a957b267..f4d4895e6 100644 --- a/lib_enc/ivas_masa_enc_fx.c +++ b/lib_enc/ivas_masa_enc_fx.c @@ -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(); } -- GitLab