From 9e20cb2123b2434ba032827e5ae201aa5f2d8683 Mon Sep 17 00:00:00 2001 From: Tommy Vaillancourt Date: Mon, 13 Apr 2026 08:11:05 -0400 Subject: [PATCH] fix for 2530 --- lib_com/options.h | 1 + lib_enc/ivas_decision_matrix_enc_fx.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index 8d06feb49..a09ef68ac 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_2530_IVAS_DECISION_MAT /* VA: Fix ambiguous usage of extract_l() */ /* ##################### End NON-BE switches ########################### */ diff --git a/lib_enc/ivas_decision_matrix_enc_fx.c b/lib_enc/ivas_decision_matrix_enc_fx.c index 1e2fb73ce..18df0e8d6 100644 --- a/lib_enc/ivas_decision_matrix_enc_fx.c +++ b/lib_enc/ivas_decision_matrix_enc_fx.c @@ -340,7 +340,11 @@ void ivas_decision_matrix_enc_fx( st->extl = WB_BWE; move16(); } +#ifdef FIX_BASOP_2530_IVAS_DECISION_MAT + ELSE IF( GE_32( st->total_brate, MIN_BRATE_WB_BWE ) && !st->flag_ACELP16k ) +#else ELSE IF( GE_16( extract_l( st->total_brate ), MIN_BRATE_WB_BWE ) && !st->flag_ACELP16k ) +#endif { test(); test(); -- GitLab