From a26cfbe6d3680c2d97cddc8ac34dcb16fc8f30b2 Mon Sep 17 00:00:00 2001 From: lintervo Date: Thu, 6 Nov 2025 15:57:20 +0200 Subject: [PATCH 1/3] Add missing code --- lib_com/options.h | 1 + lib_dec/lib_dec_fx.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index f922513d5..1328b1465 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -97,6 +97,7 @@ #define FIX_2070_JBM_TC_CHANNEL_RESCALING_ISSUE /* Eri/Orange: scale_sig32 problem on p_tc_fx[] */ #define FIX_1947_DEC_HIGH_MLD_FOR_STEREO2MONO /* FhG: Make Q-factor of synth_16_fx and output_16_fx dynamic to prevent overflow in HQ_CORE mode */ +#define FIX_2148_OBJ_EDIT_ISSUE_WITH_OSBA /* Nokia: Add missing code to solve issue /* ################### End FIXES switches ########################### */ /* #################### Start BASOP porting switches ############################ */ diff --git a/lib_dec/lib_dec_fx.c b/lib_dec/lib_dec_fx.c index 7d3ee4ffd..e3131c740 100644 --- a/lib_dec/lib_dec_fx.c +++ b/lib_dec/lib_dec_fx.c @@ -4033,6 +4033,9 @@ ivas_error IVAS_DEC_GetSamplesDecoder( move32(); hIsmMetaData[obj]->edited_radius_fx = hIsmMetaData[obj]->radius_fx; move32(); +#ifdef FIX_2148_OBJ_EDIT_ISSUE_WITH_OSBA + hIsmMetaData[obj]->edited_gain_fx = ONE_IN_Q29; +#endif } if ( EQ_32( st_ivas->ism_mode, ISM_SBA_MODE_DISC ) ) -- GitLab From c5811e76dcd3c0e5aca13208d441a4229c874571 Mon Sep 17 00:00:00 2001 From: lintervo Date: Thu, 6 Nov 2025 16:11:46 +0200 Subject: [PATCH 2/3] Add missing move() --- lib_dec/lib_dec_fx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib_dec/lib_dec_fx.c b/lib_dec/lib_dec_fx.c index e3131c740..ae2027e10 100644 --- a/lib_dec/lib_dec_fx.c +++ b/lib_dec/lib_dec_fx.c @@ -4035,6 +4035,7 @@ ivas_error IVAS_DEC_GetSamplesDecoder( move32(); #ifdef FIX_2148_OBJ_EDIT_ISSUE_WITH_OSBA hIsmMetaData[obj]->edited_gain_fx = ONE_IN_Q29; + move32(); #endif } -- GitLab From bf144bd2ecad05032314e937341e6b3c1396637b Mon Sep 17 00:00:00 2001 From: lintervo Date: Thu, 6 Nov 2025 16:25:52 +0200 Subject: [PATCH 3/3] Add missing end of comment --- lib_com/options.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index 1328b1465..50c6dd6ea 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -97,7 +97,7 @@ #define FIX_2070_JBM_TC_CHANNEL_RESCALING_ISSUE /* Eri/Orange: scale_sig32 problem on p_tc_fx[] */ #define FIX_1947_DEC_HIGH_MLD_FOR_STEREO2MONO /* FhG: Make Q-factor of synth_16_fx and output_16_fx dynamic to prevent overflow in HQ_CORE mode */ -#define FIX_2148_OBJ_EDIT_ISSUE_WITH_OSBA /* Nokia: Add missing code to solve issue +#define FIX_2148_OBJ_EDIT_ISSUE_WITH_OSBA /* Nokia: Add missing code to solve issue */ /* ################### End FIXES switches ########################### */ /* #################### Start BASOP porting switches ############################ */ -- GitLab