Commit 40408d53 authored by multrus's avatar multrus
Browse files

[cleanup] accept HYBRID_ITD_MAX

parent 4aaff20d
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -1550,10 +1550,8 @@ int16_t read_BS_adapt_GR_sg(
void stereo_dft_hybrid_ITD_flag(
    STEREO_DFT_CONFIG_DATA_HANDLE hConfig,                      /* o  : DFT stereo configuration                */
    const int32_t input_Fs                                      /* i  : CPE element sampling rate               */
#ifdef HYBRID_ITD_MAX
    ,
    const int16_t hybrid_itd_max                                /* i  : flag for hybrid ITD for very large ITDs */
#endif
);

void stereo_dft_enc_compute_itd(
+0 −1
Original line number Diff line number Diff line
@@ -148,7 +148,6 @@

/*#define FIX_XXX_JBM_FIFO_BUFFER  */                   /* FhG: prevent wraparound of a length identifier in cause of large frames and many channels*/

#define HYBRID_ITD_MAX                                 /* FhG: Improvement for DFT-stereo for cases with large ITDs */
#define FIX_462_HRTF_FILE_BR_SWITCH_MEM_ERR             /* Eri: Fix for issue 462: Use-of-uninitialized memory in external HRTF deallocation in decoder together with BR switching */
#define FIX_487_LOWRATE_SBA_TUNING_FIX                  /* Dlb: TUning fix for low bitrate cases to match theoretical longest SPAR MD bitstream */
#define FIX_490_MASA_2TC_LBR_DTX                        /* Nokia: Fixes issue 490 by correcting condition. */
+0 −2
Original line number Diff line number Diff line
@@ -334,10 +334,8 @@ ivas_error ivas_cpe_enc(
    if ( hCPE->element_mode == IVAS_CPE_DFT )
    {
        stereo_dft_hybrid_ITD_flag( hCPE->hStereoDft->hConfig, input_Fs
#ifdef HYBRID_ITD_MAX
                                    ,
                                    hCPE->hStereoDft->hItd->hybrid_itd_max
#endif
        );

        /* Time Domain ITD compensation using extrapolation */
+0 −2
Original line number Diff line number Diff line
@@ -81,10 +81,8 @@ typedef struct stereo_itd_data_struct
    int16_t prev_itd1;
    int16_t prev_itd2;

#ifdef HYBRID_ITD_MAX
    /*flag for hybrid ITD for very large ITDs*/
    int16_t hybrid_itd_max;
#endif
} ITD_DATA, *ITD_DATA_HANDLE;

typedef struct dft_ana_struct
+0 −4
Original line number Diff line number Diff line
@@ -298,10 +298,8 @@ ivas_error stereo_dft_enc_create(
    stereo_dft_enc_open( hStereoDft_loc, input_Fs, max_bwidth );

    stereo_dft_hybrid_ITD_flag( hStereoDft_loc->hConfig, input_Fs
#ifdef HYBRID_ITD_MAX
                                ,
                                hStereoDft_loc->hItd->hybrid_itd_max
#endif
    );

    *hStereoDft = hStereoDft_loc;
@@ -567,9 +565,7 @@ void stereo_enc_itd_init(
    hItd->prev_itd1 = 0;
    hItd->prev_itd2 = 0;

#ifdef HYBRID_ITD_MAX
    hItd->hybrid_itd_max = 0;
#endif
    return;
}

Loading