From a2ce3aaa15814435cb96dddb6f6254425d7356c2 Mon Sep 17 00:00:00 2001 From: Tapani Pihlajakuja Date: Wed, 8 Apr 2026 20:56:04 +0300 Subject: [PATCH] Fix BASOP issue 2516 by changing the comparison to correct one. --- lib_com/options.h | 1 + lib_rend/lib_rend_fx.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index e628cf13d..1335410af 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -122,6 +122,7 @@ #define FIX_BASOP_2497_MCMASA_LFE_WRONG_SF_INDEX /* Nokia: BASOP 2497: Fix wrong subframe index in McMASA LFE synth. */ #define FIX_BASOP_2496_OMASA_OBJ_EDIT_WRONG_ASSIGN /* Nokia: BASOP 2496: Fix wrong assignment in OMASA object edit code */ #define FIX_2495_Q_ALIGN_OSBA_RENDERER /* FhG: Basop issue #2495: Corrected exponent scaling of outAudio.data_fx before buffer accumulation in renderSbaToBinaural(). */ +#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 */ /* ##################### End NON-BE switches ########################### */ diff --git a/lib_rend/lib_rend_fx.c b/lib_rend/lib_rend_fx.c index 3c2b545f9..a58bc9eb5 100644 --- a/lib_rend/lib_rend_fx.c +++ b/lib_rend/lib_rend_fx.c @@ -4052,7 +4052,11 @@ static LSSETUP_CUSTOM_STRUCT makeCustomLsSetup( move16(); FOR( i = 0; i < rendCustomLsLayout.num_spk; ++i ) { +#ifdef FIX_BASOP_2516_REND_CUSTOM_LAYOUT_PORT_BUG + IF( GT_32( L_abs( rendCustomLsLayout.elevation_fx[i] ), EPSILON_FX ) ) +#else IF( LT_32( L_abs( rendCustomLsLayout.elevation_fx[i] ), EPSILON_FX ) ) +#endif { customLs.is_planar_setup = 0; move16(); -- GitLab