From 55df7b147e24915d0a607a87cadb0bc1c5609062 Mon Sep 17 00:00:00 2001 From: naghibza Date: Tue, 23 Jun 2026 17:02:05 +0200 Subject: [PATCH] replace the three NE_32 with EQ_32, in condition guarding the MC->SBA conversion(ivas_mc2sba_fx) --- lib_com/options.h | 1 + lib_dec/ivas_dec_fx.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index a5263a492..ebef03802 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -119,6 +119,7 @@ #define NONBE_FIX_2493_EXTRACT_L_swb_tbe_enc_fx /* FhG: Fix extract_l overflow inside swb_tbe_enc_fx() */ #define NONBE_FIX_2493_EXTRACT_L_bw_detect_fx /* FhG: Fix extract_l overflow inside bw_detect_fx(). Saturation, not a optimal fix. */ #define FIX_2493_CHECK_EXTRACT_L_FIX_INSTRUMENTATION /* FhG: Fix instrumentation related to extract_l. */ +#define FIX_BASOP_2655_MC2SBA_GATE /* FhG: BASOP #2655: replace the three NE_32 with EQ_32, in condition guarding the MC->SBA conversion(ivas_mc2sba_fx). */ /* ##################### End NON-BE switches ########################### */ diff --git a/lib_dec/ivas_dec_fx.c b/lib_dec/ivas_dec_fx.c index e66824819..2e5fb01f3 100644 --- a/lib_dec/ivas_dec_fx.c +++ b/lib_dec/ivas_dec_fx.c @@ -704,7 +704,11 @@ ivas_error ivas_dec_fx( test(); test(); test(); +#ifdef FIX_BASOP_2655_MC2SBA_GATE + IF( NE_32( st_ivas->transport_config, st_ivas->intern_config ) && ( EQ_32( st_ivas->intern_config, IVAS_AUDIO_CONFIG_FOA ) || EQ_32( st_ivas->intern_config, IVAS_AUDIO_CONFIG_HOA2 ) || EQ_32( st_ivas->intern_config, IVAS_AUDIO_CONFIG_HOA3 ) ) ) +#else IF( NE_32( st_ivas->transport_config, st_ivas->intern_config ) && ( NE_32( st_ivas->intern_config, IVAS_AUDIO_CONFIG_FOA ) || NE_32( st_ivas->intern_config, IVAS_AUDIO_CONFIG_HOA2 ) || NE_32( st_ivas->intern_config, IVAS_AUDIO_CONFIG_HOA3 ) ) ) +#endif { IF( GE_16( add( st_ivas->hTransSetup.nchan_out_woLFE, st_ivas->hTransSetup.num_lfe ), add( st_ivas->hIntSetup.nchan_out_woLFE, st_ivas->hIntSetup.num_lfe ) ) ) { -- GitLab