From 1c8b324382006501b2c49249de886801e744e247 Mon Sep 17 00:00:00 2001 From: Tapani Pihlajakuja Date: Wed, 1 Apr 2026 12:03:00 +0300 Subject: [PATCH] Fix BASOP issue 2498 by correcting the logic operator. --- 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 7976d55ed..884d1ab3d 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -103,6 +103,7 @@ #define FIX_1547_ISMDTX_HANDLE /* VA: float issue 1547: fix use of 'hISMDTX' handle */ #define FIX_1540_EXPOSE_PT_IN_RTP_HEADER_API /* Expose Payload Type setting in RTP Header */ #define FIX_BASOP_2491_MDCT_JBM_CLICK /* FhG: BASOP #2491: Fix Q_synth after TCX concealment (using ACELP concealment) */ +#define FIX_BASOP_2498_LOGIC_IN_ENC_DTX_DECISION_MTX /* Nokia: BASOP 2498: Fix the logic */ /* ##################### 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 4cb3aa296..1e2fb73ce 100644 --- a/lib_enc/ivas_decision_matrix_enc_fx.c +++ b/lib_enc/ivas_decision_matrix_enc_fx.c @@ -107,7 +107,11 @@ void ivas_decision_matrix_enc_fx( move16(); test(); +#ifdef FIX_BASOP_2498_LOGIC_IN_ENC_DTX_DECISION_MTX + if ( GE_32( st->input_Fs, 32000 ) && GE_16( st->bwidth, SWB ) ) +#else if ( GE_32( st->input_Fs, 32000 ) || GE_16( st->bwidth, SWB ) ) +#endif { st->extl = SWB_CNG; move16(); -- GitLab