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

Merge branch 'basop-2216-macro-disable_dirac_delay_comp-in-ivas_mcmasa_enc_open_fx' into 'main' 

Resolve "Macro DISABLE_DIRAC_DELAY_COMP in ivas_mcmasa_enc_open_fx()" - float

See merge request !2518
parents cd0cfafa f623a0c4

lib_com/options.h

+0 −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 */

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

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