Commit 3c459d3c authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Getting rid of ceilf in reverb modules: macros for number of taps array

parent e446b0e7

lib_com/ivas_cnst.h

+6 −0
Original line number Diff line number Diff line
@@ -1513,6 +1513,12 @@ typedef enum 
#define BINAURAL_NTAPS_SBA                       BINAURAL_NTAPS



#define BINAURAL_NTAPS_MAX                      96

#ifdef FIX_814_DOUBLE_PREC_IN_REVERB

#define BINAURAL_NTAPS_MAX_X06                  58

#define BINAURAL_NTAPS_MAX_X05                  48

#define BINAURAL_NTAPS_MAX_X04                  39

#define BINAURAL_NTAPS_MAX_X03                  29

#endif



#define HRTF_SH_ORDER                           3

#define HRTF_SH_CHANNELS                        HOA3_CHANNELS

lib_dec/ivas_binRenderer_internal.c

+4 −5
Original line number Diff line number Diff line
@@ -152,7 +152,6 @@ static ivas_error ivas_binRenderer_convModuleOpen( 
#ifdef SPLIT_REND_WITH_HEAD_ROT

    int16_t pos_idx;

#endif

    const float fltDistortion = 1e-5F;



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

     * prepare library opening
@@ -186,19 +185,19 @@ static ivas_error ivas_binRenderer_convModuleOpen( 
#ifdef FIX_814_DOUBLE_PREC_IN_REVERB

        for ( ; bandIdx < 10; bandIdx++ )

        {

            hBinRenConvModule->numTapsArray[bandIdx] = (int16_t) ( 0.6f * hBinRenConvModule->numTaps - fltDistortion + 1.0f );

            hBinRenConvModule->numTapsArray[bandIdx] = BINAURAL_NTAPS_MAX_X06;

        }

        for ( ; bandIdx < 20; bandIdx++ )

        {

            hBinRenConvModule->numTapsArray[bandIdx] = (int16_t) ( 0.5f * hBinRenConvModule->numTaps - fltDistortion + 1.0f );

            hBinRenConvModule->numTapsArray[bandIdx] = BINAURAL_NTAPS_MAX_X05;

        }

        for ( ; bandIdx < 30; bandIdx++ )

        {

            hBinRenConvModule->numTapsArray[bandIdx] = (int16_t) ( 0.4f * hBinRenConvModule->numTaps - fltDistortion + 1.0f );

            hBinRenConvModule->numTapsArray[bandIdx] = BINAURAL_NTAPS_MAX_X04;

        }

        for ( ; bandIdx < hBinRenderer->conv_band; bandIdx++ )

        {

            hBinRenConvModule->numTapsArray[bandIdx] = (int16_t) ( 0.3f * hBinRenConvModule->numTaps - fltDistortion + 1.0f );

            hBinRenConvModule->numTapsArray[bandIdx] = BINAURAL_NTAPS_MAX_X03;

        }

#else

        for ( ; bandIdx < 10; bandIdx++ )