Commit c87f2d22 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch... 

Merge branch '1158-rendering-using-fastconv-to-binaural_room_reverb-uses-brir-convolution' of forge.3gpp.org:ivas-codec-pc/ivas-codec into 1158-rendering-using-fastconv-to-binaural_room_reverb-uses-brir-convolution
parents cb8d2012 f4c69ba9

lib_dec/ivas_binRenderer_internal.c

+0 −13
Original line number Diff line number Diff line
@@ -1058,22 +1058,9 @@ static ivas_error ivas_binaural_hrtf_open( 
        {

            HrtfFastConv->fastconvReverberationEneCorrections[i] = fastconvReverberationEneCorrections[i] * scaleFactor;

        }

#else

#ifdef FIX_1158_FASTCONV_REVERB_HRTF

        if ( renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )

        {

            mvr2r( fastconvReverberationTimes, HrtfFastConv->fastconvReverberationTimes, CLDFB_NO_CHANNELS_MAX );

            mvr2r( fastconvReverberationEneCorrections, HrtfFastConv->fastconvReverberationEneCorrections, CLDFB_NO_CHANNELS_MAX );

        }

        else

        {

            mvr2r( parametricReverberationTimes, HrtfFastConv->fastconvReverberationTimes, CLDFB_NO_CHANNELS_MAX );

            mvr2r( parametricReverberationEneCorrections, HrtfFastConv->fastconvReverberationEneCorrections, CLDFB_NO_CHANNELS_MAX );

        }

#else

        mvr2r( fastconvReverberationTimes, HrtfFastConv->fastconvReverberationTimes, CLDFB_NO_CHANNELS_MAX );

        mvr2r( fastconvReverberationEneCorrections, HrtfFastConv->fastconvReverberationEneCorrections, CLDFB_NO_CHANNELS_MAX );

#endif

#endif



        *hHrtfFastConv = HrtfFastConv;