From c0b21243baaf12efd924a6a3057f44beb0066d93 Mon Sep 17 00:00:00 2001 From: Tapani Pihlajakuja Date: Sat, 11 Apr 2026 21:51:57 +0300 Subject: [PATCH] Fix BASOP issue 2524 by moving the variable zero to correct place. --- lib_com/options.h | 1 + lib_enc/ivas_masa_enc_fx.c | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index 8d06feb49..5a09bd5f1 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_2524_MASA_REDUCE_META_BUG /* Nokia: BASOP issue 2524: Fix wrong reset of W_tmp in reduce_metadata_further_fx */ /* ##################### End NON-BE switches ########################### */ diff --git a/lib_enc/ivas_masa_enc_fx.c b/lib_enc/ivas_masa_enc_fx.c index 8a957b267..4125e6d30 100644 --- a/lib_enc/ivas_masa_enc_fx.c +++ b/lib_enc/ivas_masa_enc_fx.c @@ -2579,18 +2579,26 @@ static void reduce_metadata_further_fx( Word32 x, y, z; Word32 veclen, L_tmp; +#ifndef FIX_BASOP_2524_MASA_REDUCE_META_BUG W_tmp = 0; move64(); +#endif FOR( band = 0; band < numCodingBands; band++ ) { xSum = 0; ySum = 0; zSum = 0; +#ifndef FIX_BASOP_2524_MASA_REDUCE_META_BUG bandSumEnergy = 0; move32(); +#endif move32(); move32(); move32(); +#ifdef FIX_BASOP_2524_MASA_REDUCE_META_BUG + W_tmp = 0; + move64(); +#endif FOR( sf = 0; sf < MAX_PARAM_SPATIAL_SUBFRAMES; sf++ ) { -- GitLab