Commit 4de2f725 authored by multrus's avatar multrus
Browse files

[cleanup] accept UPDATE_REVERB_UTILS

parent fdeec7f0

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -151,7 +151,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */





#define UPDATE_REVERB_UTILS                             /* Use CLDFB HRTFs of the appropriate SBA order in get_IR_from_filter_taps() */

#define FIX_612_MSVQ_UBSAN_LEFTSHIFT                    /* Eri: Issue 612 :  UBSAN: left shift of negative values in 1st stage of MSVQ  */

#define FIX_621_MSVQ_UBSAN_NULL_PTR_OFFSET              /* Eri: Issue 621 :  UBSAN:  applying non-zero offset 7200 to null pointer in lsf_msvq_ma_enc.c  */

#define FIX_600_CLEANUP_OF_MANUAL_INSTRUMENTATION       /* Eri: Issue 600 :  removed manual WMCtool instrumentation outside of WMC_TOOL_SKIP defines     */

lib_rend/ivas_reverb_utils.c

+0 −13
Original line number Diff line number Diff line
@@ -52,9 +52,6 @@ 
#define FFT_SPECTRUM_SIZE         ( 1 + ( RV_FILTER_MAX_FFT_SIZE / 2 ) )



#define N_INITIAL_IGNORED_FRAMES 4

#ifndef UPDATE_REVERB_UTILS

#define NUM_CLDFB_TAPES 7

#endif



/*-----------------------------------------------------------------------------------------*

 * Local function prototypes
@@ -227,11 +224,7 @@ static void get_IR_from_filter_taps( 
    output_sample_idx = 0;



    /* Assign CLDFB taps */

#ifdef UPDATE_REVERB_UTILS

    if ( input_audio_config == AUDIO_CONFIG_HOA3 )

#else

    if ( input_audio_config == AUDIO_CONFIG_FOA || input_audio_config == AUDIO_CONFIG_HOA2 || input_audio_config == AUDIO_CONFIG_HOA3 )

#endif

    {

        for ( band_idx = 0; band_idx < BINAURAL_CONVBANDS; band_idx++ )

        {
@@ -241,7 +234,6 @@ static void get_IR_from_filter_taps( 
            convolver_state.filter_taps_right_im[band_idx] = hHrtfFastConv->rightHRIRImag_HOA3[band_idx][hrtf_idx];

        }

    }

#ifdef UPDATE_REVERB_UTILS

    else if ( input_audio_config == AUDIO_CONFIG_HOA2 )

    {

        for ( band_idx = 0; band_idx < BINAURAL_CONVBANDS; band_idx++ )
@@ -262,7 +254,6 @@ static void get_IR_from_filter_taps( 
            convolver_state.filter_taps_right_im[band_idx] = hHrtfFastConv->rightHRIRImag_FOA[band_idx][hrtf_idx];

        }

    }

#endif

    else

    {

        array_idx = 0;
@@ -341,11 +332,7 @@ static void get_IR_from_filter_taps( 
            }

        }



#ifdef UPDATE_REVERB_UTILS

        ivas_cldfb_convolver( &convolver_state, out_CLDFB_real, out_CLDFB_imag, real_buffer_in, imag_buffer_in, BINAURAL_CONVBANDS, BINAURAL_NTAPS );

#else

        ivas_cldfb_convolver( &convolver_state, out_CLDFB_real, out_CLDFB_imag, real_buffer_in, imag_buffer_in, BINAURAL_CONVBANDS, NUM_CLDFB_TAPES );

#endif



        ppRealBuf[0] = out_CLDFB_real[0];

        ppImagBuf[0] = out_CLDFB_imag[0];