Commit 05197a97 authored by vaclav's avatar vaclav
Browse files

FIX_2649_RESET_ISM_METADATA

parent 3882460b

lib_com/options.h

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

lib_enc/lib_enc.c

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

        {