Commit 21aa3c1f authored by vaclav's avatar vaclav
Browse files

move define

parent 9039f6d1

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ 
#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 HARMONIZE_2502_GENERATE_COMFORT_NOISE_DEC       /* FhG: harmonize generate_comfort_noise_dec_fx() and generate_comfort_noise_dec_ivas_fx() */

#define FIX_2649_RESET_ISM_METADATA                     /* VA: basop issue 2649: harmonize ISM metadata reset */



/* #################### End BE switches ################################## */
@@ -117,6 +116,7 @@ 
#define NONBE_FIX_2493_EXTRACT_L_swb_tbe_enc_fx         /* FhG: Fix extract_l overflow inside swb_tbe_enc_fx() */

#define NONBE_FIX_2493_EXTRACT_L_bw_detect_fx           /* FhG: Fix extract_l overflow inside bw_detect_fx(). Saturation, not a optimal fix. */

#define FIX_2493_CHECK_EXTRACT_L_FIX_INSTRUMENTATION    /* FhG: Fix instrumentation related to extract_l. */

#define FIX_2649_RESET_ISM_METADATA                     /* VA: basop issue 2649: harmonize ISM metadata reset */



/* ##################### End NON-BE switches ########################### */

lib_enc/lib_enc_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -1343,7 +1343,11 @@ ivas_error IVAS_ENC_EncodeFrameToSerial( 
    IF( EQ_32( 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] )

            {