From 4171af2983211dcd5a922c017565b509a982ac69 Mon Sep 17 00:00:00 2001 From: "Azizi, Arash" Date: Tue, 2 Jun 2026 11:06:32 +0200 Subject: [PATCH 1/2] issue 2616: Creating the switch and changing the wrong instrumentation. --- lib_com/options.h | 1 + lib_enc/ivas_stereo_classifier_fx.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index a1b758cfc..214142551 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -96,6 +96,7 @@ #define HARMONIZE_2598_tcx_arith_decode_envelope /* FhG: harmonize tcx_arith_decode_envelope between EVS and IVAS versions */ #define HARMONIZE_2598_tcx_arith_encode_envelope /* FhG: harmonize tcx_arith_encode_envelope between EVS and IVAS versions */ #define FIX_ISSUE_2594_FALSE_COMMENT /* FhG: basop issue 2594: fixing false comments about Q value*/ +#define FIX_ISSUE_2617_WRONG_INSTR /* FhG: basop issue 2617: Instrumentation misuse in function unclr_classifier_dft_fx*/ /* #################### End BE switches ################################## */ diff --git a/lib_enc/ivas_stereo_classifier_fx.c b/lib_enc/ivas_stereo_classifier_fx.c index 5ab5f2213..c7238e49d 100644 --- a/lib_enc/ivas_stereo_classifier_fx.c +++ b/lib_enc/ivas_stereo_classifier_fx.c @@ -1067,7 +1067,11 @@ void unclr_classifier_dft_fx( ELSE { relE_ST = hStereoClassif->relE_buf_fx[0]; +#ifndef FIX_ISSUE_2617_WRONG_INSTR move16(); +#else + move32(); +#endif // !FIX_ISSUE_2617_WRONG_INSTR } IF( GT_32( hStereoClassif->relE_0_1_fx, relE_ST ) ) -- GitLab From df72ed8520c0c67b336c9b45254de0f42c72639e Mon Sep 17 00:00:00 2001 From: "Azizi, Arash" Date: Tue, 2 Jun 2026 12:48:39 +0200 Subject: [PATCH 2/2] issue 2616: Clang formatting patch --- lib_enc/ivas_stereo_classifier_fx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_enc/ivas_stereo_classifier_fx.c b/lib_enc/ivas_stereo_classifier_fx.c index c7238e49d..35453cd5b 100644 --- a/lib_enc/ivas_stereo_classifier_fx.c +++ b/lib_enc/ivas_stereo_classifier_fx.c @@ -1071,7 +1071,7 @@ void unclr_classifier_dft_fx( move16(); #else move32(); -#endif // !FIX_ISSUE_2617_WRONG_INSTR +#endif // !FIX_ISSUE_2617_WRONG_INSTR } IF( GT_32( hStereoClassif->relE_0_1_fx, relE_ST ) ) -- GitLab