Commit 69e9982d authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1139_REV_COLORATION_SHORT_T60

parent d29cd14f

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -182,7 +182,6 @@ 
#define NONBE_FIX_1212_TONAL_MDCT_CONCEALMENT           /* FhG: Fix issue 1212, zero IGF spec also in 1st concealed frame */





#define FIX_1139_REV_COLORATION_SHORT_T60               /* Nokia,FhG: Fix issue 1139, prevent sound coloration artefacts at very low reverberation times */

#define NONBE_FIX_1208_DFT_STEREO_PLC_BURST             /* Ericsson: Issue 1208, fix for overflow of sample offset counter for burst error in DFT Stereo PLC. */

#define FIX_1206_ZERO_OUT_IMDCT_BUFFERS_FOR_MCT_IGNORE  /* FhG: zero out all relevant imdct buffers in MCT decoding of channels with mct_chan_mode == MCT_CHAN_MODE_IGNORE */

#define NONBE_1199_OMASA_JBM_BRATE_SW_FLUSH             /* VA: issue 1199: fix bug in renderer flush in OMASA JBM bitrate switching */

lib_dec/ivas_binRenderer_internal.c

+0 −2
Original line number Diff line number Diff line
@@ -1229,10 +1229,8 @@ ivas_error ivas_binRenderer_open( 
                                                  st_ivas->hDecoderConfig->output_Fs,

                                                  st_ivas->hHrtfFastConv->fastconvReverberationTimes,

                                                  st_ivas->hHrtfFastConv->fastconvReverberationEneCorrections

#ifdef FIX_1139_REV_COLORATION_SHORT_T60

                                                  ,

                                                  hBinRenderer->earlyPartEneCorrection

#endif

                                                  ) ) != IVAS_ERR_OK )

        {

            return error;

lib_dec/lib_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -3050,10 +3050,8 @@ ivas_error IVAS_DEC_FeedRenderConfig( 
                                                  hIvasDec->st_ivas->hDecoderConfig->output_Fs,

                                                  NULL,

                                                  NULL

#ifdef FIX_1139_REV_COLORATION_SHORT_T60

                                                  ,

                                                  NULL

#endif

                                                  ) ) != IVAS_ERR_OK )

        {

            return error;
@@ -3071,10 +3069,8 @@ ivas_error IVAS_DEC_FeedRenderConfig( 
                                                  hIvasDec->st_ivas->hDecoderConfig->output_Fs,

                                                  NULL,

                                                  NULL

#ifdef FIX_1139_REV_COLORATION_SHORT_T60

                                                  ,

                                                  NULL

#endif

                                                  ) ) != IVAS_ERR_OK )

        {

            return error;

lib_rend/ivas_dirac_dec_binaural_functions.c

+0 −2
Original line number Diff line number Diff line
@@ -246,10 +246,8 @@ ivas_error ivas_dirac_dec_init_binaural_data( 
                                                          output_Fs,

                                                          ( *phHrtfParambin )->parametricReverberationTimes,

                                                          ( *phHrtfParambin )->parametricReverberationEneCorrections

#ifdef FIX_1139_REV_COLORATION_SHORT_T60

                                                          ,

                                                          hDiracDecBin->earlyPartEneCorrection

#endif

                                                          ) ) != IVAS_ERR_OK )

                {

                    return error;

lib_rend/ivas_prot_rend.h

+0 −2
Original line number Diff line number Diff line
@@ -934,10 +934,8 @@ ivas_error ivas_binaural_reverb_init( 
    const int32_t sampling_rate,                                /* i  : sampling rate                           */

    const float *defaultTimes,                                  /* i  : default reverberation times             */

    const float *defaultEne                                     /* i  : default reverberation energies          */

    #ifdef FIX_1139_REV_COLORATION_SHORT_T60

    ,

    float *earlyEne                                             /* i/o: Early part energies to be modified      */

    #endif

);



void ivas_binaural_reverb_close(