Commit eb3bea0b authored by Jouni Paulus's avatar Jouni Paulus
Browse files

Merge branch '683-missing-clean-up-of-ism-and-masa-file-writers-in-decodevoip' into 'main' 

Resolve "Missing clean-up of ISM and MASA file writers in decodeVoIP"

See merge request !934
parents fc0510a5 2ec105fc

apps/decoder.c

+7 −0
Original line number Diff line number Diff line
@@ -2891,6 +2891,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 )

    {

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -240,6 +240,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 ######################### */