Commit 6dea53a5 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[fix] simplify setting of filterTaps pointers in ivas_binRenderer_convModuleOpen()

parent f4d9f8bc

lib_dec/ivas_binRenderer_internal.c

+7 −18
Original line number Diff line number Diff line
@@ -404,51 +404,40 @@ static ivas_error ivas_binRenderer_convModuleOpen( 
                }

                else

                {

                    if ( input_config == IVAS_AUDIO_CONFIG_HOA3 )

                    {

/* HOA3 filter coefficients */

#ifdef FIX_1146_OPT_FASTCONV_STRUCT

                    if ( input_config == IVAS_AUDIO_CONFIG_HOA3 || input_config == IVAS_AUDIO_CONFIG_HOA2 || input_config == IVAS_AUDIO_CONFIG_FOA )

                    {

                        hBinRenConvModule->filterTapsLeftReal[bandIdx][chIdx] = hHrtf->leftHRIRReal_SBA[bandIdx][chIdx];

                        hBinRenConvModule->filterTapsLeftImag[bandIdx][chIdx] = hHrtf->leftHRIRImag_SBA[bandIdx][chIdx];

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

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

                    }

#else

                    if ( input_config == IVAS_AUDIO_CONFIG_HOA3 )

                    {

                        /* HOA3 filter coefficients */

                        hBinRenConvModule->filterTapsLeftReal[bandIdx][chIdx] = hHrtf->leftHRIRReal_HOA3[bandIdx][chIdx];

                        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];

#endif

                    }

                    else if ( input_config == IVAS_AUDIO_CONFIG_HOA2 )

                    {

                        /* HOA2 filter coefficients */

#ifdef FIX_1146_OPT_FASTCONV_STRUCT

                        hBinRenConvModule->filterTapsLeftReal[bandIdx][chIdx] = hHrtf->leftHRIRReal_SBA[bandIdx][chIdx];

                        hBinRenConvModule->filterTapsLeftImag[bandIdx][chIdx] = hHrtf->leftHRIRImag_SBA[bandIdx][chIdx];

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

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

#else

                        hBinRenConvModule->filterTapsLeftReal[bandIdx][chIdx] = hHrtf->leftHRIRReal_HOA2[bandIdx][chIdx];

                        hBinRenConvModule->filterTapsLeftImag[bandIdx][chIdx] = hHrtf->leftHRIRImag_HOA2[bandIdx][chIdx];

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

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

#endif

                    }

                    else if ( input_config == IVAS_AUDIO_CONFIG_FOA )

                    {

                        /* FOA filter coefficients */

#ifdef FIX_1146_OPT_FASTCONV_STRUCT

                        hBinRenConvModule->filterTapsLeftReal[bandIdx][chIdx] = hHrtf->leftHRIRReal_SBA[bandIdx][chIdx];

                        hBinRenConvModule->filterTapsLeftImag[bandIdx][chIdx] = hHrtf->leftHRIRImag_SBA[bandIdx][chIdx];

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

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

#else

                        hBinRenConvModule->filterTapsLeftReal[bandIdx][chIdx] = hHrtf->leftHRIRReal_FOA[bandIdx][chIdx];

                        hBinRenConvModule->filterTapsLeftImag[bandIdx][chIdx] = hHrtf->leftHRIRImag_FOA[bandIdx][chIdx];

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

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

#endif

                    }

#endif

                    else

                    {

                        return IVAS_ERR_INVALID_INPUT_FORMAT;