Commit 45b3a432 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] merge UPDATE_SBA_FILTER_WITH_SUPPORT_FOA_HOA2_FILTERS into UPDATE_SBA_FILTER

parent bf7a4383

lib_com/ivas_cnst.h

+1 −1
Original line number Diff line number Diff line
@@ -1448,7 +1448,7 @@ typedef enum 
{

    BINAURAL_INPUT_AUDIO_CONFIG_INVALID,

    BINAURAL_INPUT_AUDIO_CONFIG_COMBINED,       /* 5_1, 5_1_2, 5_1_4, 7_1, 7_1_4 */

#ifdef UPDATE_SBA_FILTER_WITH_SUPPORT_FOA_HOA2_FILTERS    

#ifdef UPDATE_SBA_FILTER    

    BINAURAL_INPUT_AUDIO_CONFIG_HOA3,            /*  HOA3 */

    BINAURAL_INPUT_AUDIO_CONFIG_HOA2,            /* HOA2 */

    BINAURAL_INPUT_AUDIO_CONFIG_FOA,            /* FOA */

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -174,7 +174,6 @@ 


#define USE_HRIR_128_METH5_IRC_53_Q10_SYML_ITRP1_48000

#define UPDATE_SBA_FILTER

#define UPDATE_SBA_FILTER_WITH_SUPPORT_FOA_HOA2_FILTERS



/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

lib_dec/ivas_binRenderer_internal.c

+4 −4
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ static ivas_error ivas_binRenderer_convModuleOpen( 
                else

                {

#ifdef UPDATE_SBA_FILTER

#ifdef UPDATE_SBA_FILTER_WITH_SUPPORT_FOA_HOA2_FILTERS

#ifdef UPDATE_SBA_FILTER

                    if ( input_config == AUDIO_CONFIG_HOA3 )

                    {

#endif
@@ -360,7 +360,7 @@ static ivas_error ivas_binRenderer_convModuleOpen( 
                        hBinRenConvModule->filterTapsLeftImag[bandIdx][chIdx] = hHrtf->leftHRIRImag_HOA3[bandIdx][chIdx];

                        hBinRenConvModule->filterTapsRightReal[bandIdx][chIdx] = hHrtf->rightHRIRReal_HOA3[bandIdx][chIdx];

                        hBinRenConvModule->filterTapsRightImag[bandIdx][chIdx] = hHrtf->rightHRIRImag_HOA3[bandIdx][chIdx];

#ifdef UPDATE_SBA_FILTER_WITH_SUPPORT_FOA_HOA2_FILTERS

#ifdef UPDATE_SBA_FILTER

                    }

                    else if ( input_config == AUDIO_CONFIG_HOA2 )

                    {
@@ -428,7 +428,7 @@ static ivas_error ivas_binaural_hrtf_open( 


        HrtfFastConv->FASTCONV_HRIR_latency_s = FASTCONV_HRIR_latency_s;

        HrtfFastConv->FASTCONV_HOA3_latency_s = FASTCONV_HOA3_latency_s;

#ifdef UPDATE_SBA_FILTER_WITH_SUPPORT_FOA_HOA2_FILTERS

#ifdef UPDATE_SBA_FILTER

        HrtfFastConv->FASTCONV_HOA2_latency_s = FASTCONV_HOA2_latency_s;

        HrtfFastConv->FASTCONV_FOA_latency_s = FASTCONV_FOA_latency_s;

#endif
@@ -720,7 +720,7 @@ ivas_error ivas_binRenderer_open( 
            }

            else

            {

#ifdef UPDATE_SBA_FILTER_WITH_SUPPORT_FOA_HOA2_FILTERS

#ifdef UPDATE_SBA_FILTER

                if ( hBinRenderer->nInChannels == 16 )

                {

                    st_ivas->binaural_latency_ns = (int32_t) ( st_ivas->hHrtfFastConv->FASTCONV_HOA3_latency_s * 1000000000.f );

lib_rend/ivas_crend.c

+4 −4
Original line number Diff line number Diff line
@@ -448,7 +448,7 @@ static ivas_error ivas_rend_initCrend( 
        else if ( inConfigType == IVAS_REND_AUDIO_CONFIG_TYPE_AMBISONICS )

        {

#ifdef UPDATE_SBA_FILTER

#ifdef UPDATE_SBA_FILTER_WITH_SUPPORT_FOA_HOA2_FILTERS

#ifdef UPDATE_SBA_FILTER

            if ( inConfig == IVAS_REND_AUDIO_CONFIG_HOA3 )

            {

#endif
@@ -532,7 +532,7 @@ static ivas_error ivas_rend_initCrend( 
                        hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_HOA3_HRIR_coeff_diffuse_im_16kHz[j];

                    }

                }

#ifdef UPDATE_SBA_FILTER_WITH_SUPPORT_FOA_HOA2_FILTERS

#ifdef UPDATE_SBA_FILTER

            }

            else if ( inConfig == IVAS_REND_AUDIO_CONFIG_HOA2 )

            {
@@ -894,7 +894,7 @@ static ivas_error ivas_rend_initCrend( 
        else if ( inConfigType == IVAS_REND_AUDIO_CONFIG_TYPE_AMBISONICS )

        {

#ifdef UPDATE_SBA_FILTER

#ifdef UPDATE_SBA_FILTER_WITH_SUPPORT_FOA_HOA2_FILTERS

#ifdef UPDATE_SBA_FILTER

            if ( inConfig == IVAS_REND_AUDIO_CONFIG_HOA3 )

            {

#endif
@@ -921,7 +921,7 @@ static ivas_error ivas_rend_initCrend( 
                    hHrtf->pOut_to_bin_diffuse_re[j] = hSetOfHRTF->hHRTF_hrir_hoa3->pOut_to_bin_diffuse_re[j];

                    hHrtf->pOut_to_bin_diffuse_im[j] = hSetOfHRTF->hHRTF_hrir_hoa3->pOut_to_bin_diffuse_im[j];

                }

#ifdef UPDATE_SBA_FILTER_WITH_SUPPORT_FOA_HOA2_FILTERS

#ifdef UPDATE_SBA_FILTER

            }

            else if ( inConfig == IVAS_REND_AUDIO_CONFIG_HOA2 )

            {

lib_rend/ivas_hrtf.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ ivas_error ivas_HRTF_CRend_binary_open( 


    ( *hSetOfHRTF )->hHRTF_hrir_combined = NULL;

    ( *hSetOfHRTF )->hHRTF_hrir_hoa3 = NULL;

#ifdef UPDATE_SBA_FILTER_WITH_SUPPORT_FOA_HOA2_FILTERS

#ifdef UPDATE_SBA_FILTER

    ( *hSetOfHRTF )->hHRTF_hrir_hoa2 = NULL;

    ( *hSetOfHRTF )->hHRTF_hrir_foa = NULL;

#endif