From d9181830a60dd3c0f5e24bf3a6388684a5eda7c8 Mon Sep 17 00:00:00 2001 From: Stefan Bayer Date: Fri, 11 Aug 2023 11:30:49 +0200 Subject: [PATCH] add missing clean up of ISM and MASA file writers to the JBM decoding function --- apps/decoder.c | 7 +++++++ lib_com/options.h | 1 + 2 files changed, 8 insertions(+) diff --git a/apps/decoder.c b/apps/decoder.c index 4e59e521cf..14ea20589b 100644 --- a/apps/decoder.c +++ b/apps/decoder.c @@ -2876,6 +2876,13 @@ cleanup: #ifdef SUPPORT_JBM_TRACEFILE JbmTraceFileWriter_close( &jbmTraceWriter ); #endif +#ifdef FIX_683_JBM_CLEANUP + MasaFileWriter_close( &masaWriter ); + for ( int16_t i = 0; i < IVAS_MAX_NUM_OBJECTS; i++ ) + { + IsmFileWriter_close( &ismWriters[i] ); + } +#endif if ( decodingFailed && error == IVAS_ERR_OK ) { diff --git a/lib_com/options.h b/lib_com/options.h index 5774d4a8b2..78b7a447a9 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -233,6 +233,7 @@ #define FIX_657_REMOVE_EDITING /* Nokia: Remove remaining unused coded related to object editing */ #define FIX_634_MASA_JBM_UNUSED_PARAMETER /* Nokia: Fix issue 634 by removing the unnecessary argument. */ #define FIX_675_WB_OMASA /* Nokia: Fix for issue 675 solving the crash in OMASA for WB input */ +#define FIX_683_JBM_CLEANUP /* FhG: Fix for issue 683, add clean up for ISM and MASA file writers */ /* ################## End BE DEVELOPMENT switches ######################### */ -- GitLab