Commit e404a453 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 1db40586 0094d5eb

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ 
#define FIX_2404_HARM_SIGNAL_CLAS                       /* VA: basop-2404, harmonize signal_clas and signa_ivas_clas */

#define HARMONIZE_ACELP_ENC                             /* VA: basop issue 2400: Remove duplicated main ACELP encoder function */

#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_fx.c

+6 −0
Original line number Diff line number Diff line
@@ -2096,6 +2096,12 @@ static Word16 GR_bits_azimuth_context_fx( 
    Word16 no_symb_local[MAX_PARAM_SPATIAL_SUBFRAMES];

    Word16 no_data = 0;

    move16();

#ifdef FIX_FLOAT_1522_LTV_MSAN_QMETADATA_ENC_EC3



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

    move16();



#endif

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

    {

        IF( LT_32( data_in[i], MASA_NO_INDEX ) )