Commit 0ba49334 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_683_JBM_CLEANUP

parent 3c53d4d8

apps/decoder.c

+0 −2
Original line number Diff line number Diff line
@@ -2855,13 +2855,11 @@ 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

+0 −1
Original line number Diff line number Diff line
@@ -172,7 +172,6 @@ 






#define FIX_683_JBM_CLEANUP                             /* FhG: Fix for issue 683, add clean up for ISM and MASA file writers */

#define FIX_689_USAN_QSPHERICAL                         /* Nokia: Fix usan error from issue 689 */

#define FIX_680_ACELP_TABLE_OMASA                       /* Nokia: Fix for issue 680 preventing overindexing of PulseConfTable */

#define FIX_685_BER_IN_HVQ                              /* Eri: Fix for issue 685. Invalid configuration in EVS now happening in IVAS with variable rate core. Remove BER warning for IVAS. */