Commit 585729e5 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

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

Merge remote-tracking branch 'origin/main' into float-1493-improve-stability-of-decisions-in-masa-metadata-reduction-in-encoder
parents 5f3d7806 61075657

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ 
/*#define DEBUG_STEREO_DFT_OUTRESPRED*/         /* output residual prediction signal instead of L/R*/



/*DirAC Debug switches*/

/*#define DEBUG_DISABLE_DIRAC_DELAY_COMP */     /* temporarily disable delay compensation on DirAC encoder */

/*#define DEBUG_BS_READ_WRITE*/

/*#define DEBUG_MODE_DIRAC_NOCORE*/

/*#define DEBUG_MODE_QMETADATA*/                /* output q_metadata parameters */
@@ -163,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_mcmasa_enc.c

+0 −3
Original line number Diff line number Diff line
@@ -169,9 +169,6 @@ ivas_error ivas_mcmasa_enc_open( 


    /* initialize delay compensation */

    hMcMasa->num_samples_delay_comp = NS2SA( input_Fs, DELAY_DIRAC_ENC_CMP_NS );

#ifdef DISABLE_DIRAC_DELAY_COMP

    hMcMasa->num_samples_delay_comp = 0; /* disable delay compensation by setting to 0 */

#endif

    tmp_f = (float) hMcMasa->num_samples_delay_comp / (float) ( NS2SA( input_Fs, DIRAC_SLOT_ENC_NS ) );

    hMcMasa->num_slots_delay_comp = (int16_t) ( tmp_f );

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++ )

    {

scripts/prepare_delivery.sh

+0 −1
Original line number Diff line number Diff line
@@ -230,7 +230,6 @@ if coan_exists; then 
  echo "-UDEBUG_STEREO_DFT_NOQRES"             >> $COAN_LIST

  echo "-UDEBUG_STEREO_DFT_OUTRESPRED"         >> $COAN_LIST

  echo "-UDBG_STEREO_ICBWE2_TBE2K8"            >> $COAN_LIST

  echo "-UDEBUG_DISABLE_DIRAC_DELAY_COMP"      >> $COAN_LIST

  echo "-UDEBUG_BS_READ_WRITE"                 >> $COAN_LIST

  echo "-UDEBUG_MODE_DIRAC_NOCORE"             >> $COAN_LIST

  echo "-UDEBUG_MODE_QMETADATA"                >> $COAN_LIST