Commit 2ad0fa86 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

remove left-overs from experimantal binaural-signal scaling

parent a8dede3c

lib_dec/ivas_binRenderer_internal.c

+3 −18
Original line number Diff line number Diff line
@@ -2114,12 +2114,7 @@ void ivas_rend_CldfbMultiBinRendProcess( 
    float Cldfb_Out_Real[MAX_HEAD_ROT_POSES * BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* o  : Binaural signals */

    float Cldfb_Out_Imag[MAX_HEAD_ROT_POSES * BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX],

    const int16_t low_res_pre_rend_rot,

    const int16_t num_subframes

#ifdef NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING

    ,

    AUDIO_CONFIG output_config /* i : output configuration */

#endif

)

    const int16_t num_subframes )

{

    int16_t slot_idx, ch_idx, idx, pose_idx, i, j;

    int16_t sf_idx;
@@ -2169,19 +2164,9 @@ void ivas_rend_CldfbMultiBinRendProcess( 
#endif



#ifdef SPLIT_REND_WITH_HEAD_ROT_DEBUG

        ivas_binRenderer( hCldfbRend, pMultiBinPoseData, *pCombinedOrientationData, MAX_PARAM_SPATIAL_SUBFRAMES, &head_track_post, Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural, Cldfb_RealBuffer_sfIn, Cldfb_ImagBuffer_sfIn

#ifdef NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING

                          ,

                          output_config

#endif

        );

        ivas_binRenderer( hCldfbRend, pMultiBinPoseData, *pCombinedOrientationData, MAX_PARAM_SPATIAL_SUBFRAMES, &head_track_post, Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural, Cldfb_RealBuffer_sfIn, Cldfb_ImagBuffer_sfIn );

#else

        ivas_binRenderer( hCldfbRend, pMultiBinPoseData, *pCombinedOrientationData, MAX_PARAM_SPATIAL_SUBFRAMES, Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural, Cldfb_RealBuffer_sfIn, Cldfb_ImagBuffer_sfIn

#ifdef NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING

                          ,

                          output_config

#endif

        );

        ivas_binRenderer( hCldfbRend, pMultiBinPoseData, *pCombinedOrientationData, MAX_PARAM_SPATIAL_SUBFRAMES, Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural, Cldfb_RealBuffer_sfIn, Cldfb_ImagBuffer_sfIn );

#endif

        for ( pose_idx = 0; pose_idx < hCldfbRend->numPoses; pose_idx++ )

        {

lib_rend/ivas_prot_rend.h

+0 −4
Original line number Diff line number Diff line
@@ -1901,10 +1901,6 @@ void ivas_rend_CldfbMultiBinRendProcess( 
    float Cldfb_Out_Imag[MAX_HEAD_ROT_POSES*BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX],

    const int16_t low_res_pre_rend_rot, 

    const int16_t num_subframes

#ifdef NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING

    ,

    AUDIO_CONFIG output_config /* i : output configuration */

#endif

);



ivas_error ivas_rend_openCldfb(

lib_rend/lib_rend.c

+4 −24
Original line number Diff line number Diff line
@@ -7316,12 +7316,7 @@ static ivas_error renderSbaToMultiBinauralCldfb( 
    float Cldfb_Out_Real[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX],

    float Cldfb_Out_Imag[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX],

    const int16_t low_res_pre_rend_rot,

    const int16_t num_subframes

#ifdef NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING

    ,

    AUDIO_CONFIG output_config /* i : output configuration */

#endif

)

    const int16_t num_subframes )

{

    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];
@@ -7329,12 +7324,7 @@ static ivas_error renderSbaToMultiBinauralCldfb( 
    copyBufferToCLDFBarray( sbaInput->base.inputBuffer, Cldfb_RealBuffer, Cldfb_ImagBuffer );



    ivas_rend_CldfbMultiBinRendProcess( sbaInput->cldfbRendWrapper.hCldfbRend, sbaInput->base.ctx.pCombinedOrientationData, &sbaInput->base.ctx.pSplitRendWrapper->multiBinPoseData,

                                        Cldfb_RealBuffer, Cldfb_ImagBuffer, Cldfb_Out_Real, Cldfb_Out_Imag, low_res_pre_rend_rot, num_subframes

#ifdef NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING

                                        ,

                                        output_config

#endif

    );

                                        Cldfb_RealBuffer, Cldfb_ImagBuffer, Cldfb_Out_Real, Cldfb_Out_Imag, low_res_pre_rend_rot, num_subframes );



    return IVAS_ERR_OK;

}
@@ -7359,12 +7349,7 @@ static ivas_error renderSbaToSplitBinaural( 
    if ( sbaInput->base.ctx.hhRendererConfig[0]->split_rend_config.rendererSelection == IVAS_SPLIT_REND_RENDERER_SELECTION_FASTCONV )

    {

        if ( ( renderSbaToMultiBinauralCldfb( sbaInput, Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural, low_res_pre_rend_rot,

                                              getNumSubframesInBuffer( &outAudio, *sbaInput->base.ctx.pOutSampleRate )

#ifdef NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING

                                                  ,

                                              outConfig

#endif

                                              ) ) != IVAS_ERR_OK )

                                              getNumSubframesInBuffer( &outAudio, *sbaInput->base.ctx.pOutSampleRate ) ) ) != IVAS_ERR_OK )

        {

            return error;

        }
@@ -7409,12 +7394,7 @@ static ivas_error renderSbaToBinaural( 
        float Cldfb_ImagBuffer_Binaural[BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];



        if ( ( error = renderSbaToMultiBinauralCldfb( sbaInput, Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural, 0,

                                                      getNumSubframesInBuffer( &outAudio, *sbaInput->base.ctx.pOutSampleRate )

#ifdef NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING

                                                          ,

                                                      outConfig

#endif

                                                      ) ) != IVAS_ERR_OK )

                                                      getNumSubframesInBuffer( &outAudio, *sbaInput->base.ctx.pOutSampleRate ) ) ) != IVAS_ERR_OK )

        {

            return error;

        }