From 05197a979e7f9eab449eef52908a2d7f2e98117f Mon Sep 17 00:00:00 2001 From: vaclav Date: Sun, 21 Jun 2026 12:43:12 +0200 Subject: [PATCH 1/3] FIX_2649_RESET_ISM_METADATA --- lib_com/options.h | 1 + lib_enc/lib_enc.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index a33f3986f..feae706c7 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -163,6 +163,7 @@ /*#define FIX_I4_OL_PITCH*/ /* fix open-loop pitch used for EVS core switching */ #define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */ #define NONBE_1122_KEEP_EVS_MODE_UNCHANGED /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR. */ +#define FIX_2649_RESET_ISM_METADATA /* VA: basop issue 2649: harmonize ISM metadata reset */ /* #################### End BE switches ################################## */ diff --git a/lib_enc/lib_enc.c b/lib_enc/lib_enc.c index 3f87aad9a..d84c9f3c2 100644 --- a/lib_enc/lib_enc.c +++ b/lib_enc/lib_enc.c @@ -1187,7 +1187,11 @@ ivas_error IVAS_ENC_EncodeFrameToSerial( return error; } +#ifdef FIX_2649_RESET_ISM_METADATA + if ( hEncoderConfig->ivas_format == ISM_FORMAT || hEncoderConfig->ivas_format == MASA_ISM_FORMAT || hEncoderConfig->ivas_format == SBA_ISM_FORMAT ) +#else if ( hEncoderConfig->ivas_format == ISM_FORMAT ) +#endif { for ( i = 0; i < hEncoderConfig->nchan_inp; ++i ) { -- GitLab From 30cf8cc007d26dff6d6ebb5ce54ff824ce755f57 Mon Sep 17 00:00:00 2001 From: vaclav Date: Sun, 21 Jun 2026 16:33:54 +0200 Subject: [PATCH 2/3] fix --- lib_enc/lib_enc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib_enc/lib_enc.c b/lib_enc/lib_enc.c index d84c9f3c2..bf306d6e9 100644 --- a/lib_enc/lib_enc.c +++ b/lib_enc/lib_enc.c @@ -1193,11 +1193,15 @@ ivas_error IVAS_ENC_EncodeFrameToSerial( if ( hEncoderConfig->ivas_format == ISM_FORMAT ) #endif { +#ifdef FIX_2649_RESET_ISM_METADATA + for ( i = 0; i < hEncoderConfig->nchan_ism; ++i ) +#else for ( i = 0; i < hEncoderConfig->nchan_inp; ++i ) +#endif { if ( !hIvasEnc->ismMetadataProvided[i] ) { - ivas_ism_reset_metadata_API( hIvasEnc->st_ivas->hIsmMetaData[i] ); + ivas_ism_reset_metadata_API( st_ivas->hIsmMetaData[i] ); } } resetIsmMetadataProvidedFlags( hIvasEnc ); -- GitLab From 3e36136a274b91e2b4bd087568930133e9caca78 Mon Sep 17 00:00:00 2001 From: vaclav Date: Mon, 22 Jun 2026 10:28:42 +0200 Subject: [PATCH 3/3] move define --- lib_com/options.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index feae706c7..843afbcfa 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -163,7 +163,6 @@ /*#define FIX_I4_OL_PITCH*/ /* fix open-loop pitch used for EVS core switching */ #define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */ #define NONBE_1122_KEEP_EVS_MODE_UNCHANGED /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR. */ -#define FIX_2649_RESET_ISM_METADATA /* VA: basop issue 2649: harmonize ISM metadata reset */ /* #################### End BE switches ################################## */ @@ -172,6 +171,7 @@ #define FIX_1576_LCLD_CRASH_DIFFERENT_CODEC_ISAR_FRAME_SIZE /* Dolby: float issue 1576: fix for crash in LCLD mode when codec frame size is less than isar frame size */ #define FIX_FLOAT_1600_OMASA_WRONG_RENDER_PATH /* Nokia: float issue 1600: fix initialization condition of stereo type detection for OMASA */ +#define FIX_2649_RESET_ISM_METADATA /* VA: basop issue 2649: harmonize ISM metadata reset */ /* ##################### End NON-BE switches ########################### */ -- GitLab