Commit f623a0c4 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge remote-tracking branch 'origin/main' into... 

Merge remote-tracking branch 'origin/main' into basop-2216-macro-disable_dirac_delay_comp-in-ivas_mcmasa_enc_open_fx
parents ac1c0210 cd0cfafa

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ 
#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_2392_MSAN_DESTROY_DEC                       /* VA: basop issue 2392: fix MSAN in ivas_destroy_dec_fx() */

#define FIX_FLOAT_1522_LTV_MSAN_QMETADATA_ENC_EC3       /* Nokia: float issue 1522: fix uninit MSAN in EC3 of qmetadata encoding */



/* #################### End BE switches ################################## */

lib_enc/ivas_qmetadata_enc.c

+4 −0
Original line number Diff line number Diff line
@@ -2105,6 +2105,10 @@ static int16_t GR_bits_azimuth_context( 
    int16_t real_GR_ord1;

    int16_t no_symb_local[MAX_PARAM_SPATIAL_SUBFRAMES];

    int16_t no_data = 0;

#ifdef FIX_FLOAT_1522_LTV_MSAN_QMETADATA_ENC_EC3



    *real_GR_ord = GR_order; /* Init to avoid sanitizer warnings */

#endif



    for ( i = 0; i < no_data_in; i++ )

    {