From 893878050b5e90a33dae39e22008bc0e835f2213 Mon Sep 17 00:00:00 2001 From: Tapani Pihlajakuja Date: Fri, 8 Aug 2025 10:40:24 +0300 Subject: [PATCH] Port float MR1770 to BASOP --- lib_com/options.h | 1 + lib_enc/ivas_masa_enc_fx.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index d1e0bcee2..b50d5cadf 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -124,6 +124,7 @@ #define NONBE_FIX_MC_LFE_LPF /* Dlb: Adding the LFE LPF filter back for MC content. */ #define NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR /* Nok: issue 1074 fixing number of objects signaling in OMASA low rate */ #define FIX_1222_OMASA_DEC_CHANNEL_BUFFERS /* VA: issue 1222: Reduction of the number of channel buffers in OMASA decoder */ +#define NONBE_FIX_1174_MCMASA_LBR_LOOP_ERROR /* Nokia: Fix issue 1174 by removing the unnecessary inner loop causing problems. */ /* #################### End BASOP porting switches ############################ */ diff --git a/lib_enc/ivas_masa_enc_fx.c b/lib_enc/ivas_masa_enc_fx.c index 0c87faa4e..cfd2aaef4 100644 --- a/lib_enc/ivas_masa_enc_fx.c +++ b/lib_enc/ivas_masa_enc_fx.c @@ -2667,11 +2667,16 @@ static void reduce_metadata_further_fx( /* Copy spread coherence to the rest of subframes for the coherence coding algorithm. */ FOR( sf = 1; sf < MAX_PARAM_SPATIAL_SUBFRAMES; sf++ ) { +#ifdef NONBE_FIX_1174_MCMASA_LBR_LOOP_ERROR + hqmetadata->q_direction[0].coherence_band_data[band].spread_coherence[sf] = hqmetadata->q_direction[0].coherence_band_data[band].spread_coherence[0]; // Q0 + move16(); +#else FOR( band = 0; band < numCodingBands; band++ ) { hqmetadata->q_direction[0].coherence_band_data[band].spread_coherence[sf] = hqmetadata->q_direction[0].coherence_band_data[band].spread_coherence[0]; // Q0 move16(); } +#endif } /* Surround coherence is already merged through time */ -- GitLab