Commit 750a8489 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept nested sub-switch SPLIT_REND_STACK_OPT

parent 4ea88c8e

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -204,7 +204,6 @@ 
#define SPLIT_REND_PLC

/*CLDFB CODEC SWITCHES -- END*/



#define SPLIT_REND_STACK_OPT

#endif /* SPLIT_REND_WITH_HEAD_ROT */



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

lib_rend/lib_rend.c

+0 −36
Original line number Diff line number Diff line
@@ -7416,7 +7416,6 @@ static ivas_error renderSbaToMultiBinaural( 
    return IVAS_ERR_OK;

}



#ifdef SPLIT_REND_STACK_OPT

static ivas_error renderSbaToMultiBinauralCldfb( input_sba *sbaInput,

                                                 float Cldfb_Out_Real[][BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX],

                                                 float Cldfb_Out_Imag[][BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX],
@@ -7438,7 +7437,6 @@ static ivas_error renderSbaToMultiBinauralCldfb( input_sba *sbaInput, 
        low_res_pre_rend_rot );

    return IVAS_ERR_OK;

}

#endif



static ivas_error renderSbaToSplitBinaural(

    input_sba *sbaInput,
@@ -7474,27 +7472,10 @@ static ivas_error renderSbaToSplitBinaural( 
    if ( sbaInput->base.ctx.hhRendererConfig[0]->renderer_type_override == RENDER_TYPE_OVERRIDE_FASTCONV )

    {



#ifdef SPLIT_REND_STACK_OPT

        renderSbaToMultiBinauralCldfb( sbaInput,

                                       Cldfb_RealBuffer_Binaural,

                                       Cldfb_ImagBuffer_Binaural,

                                       low_res_pre_rend_rot );

#else

        float Cldfb_RealBuffer[MAX_OUTPUT_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];

        float Cldfb_ImagBuffer[MAX_OUTPUT_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];



        copyBufferToCLDFBarray( sbaInput->base.inputBuffer, Cldfb_RealBuffer, Cldfb_ImagBuffer );



        ivas_rend_CldfbMultiBinRendProcess(

            sbaInput->cldfbRendWrapper.hCldfbRend,

            sbaInput->base.ctx.pHeadRotData,

            &sbaInput->splitRendWrapper.multiBinPoseData,

            Cldfb_RealBuffer,

            Cldfb_ImagBuffer,

            Cldfb_RealBuffer_Binaural,

            Cldfb_ImagBuffer_Binaural,

            low_res_pre_rend_rot );

#endif

        max_band = sbaInput->cldfbRendWrapper.hCldfbRend->max_band;

        td_input = 0;

    }
@@ -7553,27 +7534,10 @@ renderSbaToBinaural( 
    {

        float Cldfb_RealBuffer_Binaural[1][BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];

        float Cldfb_ImagBuffer_Binaural[1][BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];

#ifdef SPLIT_REND_STACK_OPT

        renderSbaToMultiBinauralCldfb( sbaInput,

                                       Cldfb_RealBuffer_Binaural,

                                       Cldfb_ImagBuffer_Binaural,

                                       0 );

#else

        float Cldfb_RealBuffer[MAX_OUTPUT_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];

        float Cldfb_ImagBuffer[MAX_OUTPUT_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];



        copyBufferToCLDFBarray( sbaInput->base.inputBuffer, Cldfb_RealBuffer, Cldfb_ImagBuffer );



        ivas_rend_CldfbMultiBinRendProcess(

            sbaInput->cldfbRendWrapper.hCldfbRend,

            sbaInput->base.ctx.pHeadRotData,

            &sbaInput->splitRendWrapper.multiBinPoseData,

            Cldfb_RealBuffer,

            Cldfb_ImagBuffer,

            Cldfb_RealBuffer_Binaural,

            Cldfb_ImagBuffer_Binaural,

            0 );

#endif

        accumulateCLDFBArrayToBuffer( Cldfb_RealBuffer_Binaural[0], Cldfb_ImagBuffer_Binaural[0], &outAudio );

    }

    else