Commit 621a3a43 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_463_TD_RENDERER_DIRECTIVITY_RESET

parent 99ea4b1e

lib_com/options.h

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






#define FIX_463_TD_RENDERER_DIRECTIVITY_RESET           /* Eri: Remove unintentional reset of directivity pattern */

#define FIX_642											/* FhG: Fix for issue 642, buggy DoA-array access in DirAC head rotation*/

#define FIX_443_FD_CNG_INIT                             /* FhG: correct bitrate value for FD-CNG init */

#define VARIABLE_SPEED_DECODING                         /* FhG: Contribution 37: variable speed decoding employing the JBM functioniality */

lib_rend/ivas_objectRenderer.c

+0 −7
Original line number Diff line number Diff line
@@ -477,13 +477,6 @@ void TDREND_Update_object_positions( 
            angles_to_vec( hIsmMetaData[nS]->radius, hIsmMetaData[nS]->azimuth, hIsmMetaData[nS]->elevation, Pos );

            angles_to_vec( 1.0f, hIsmMetaData[nS]->yaw, hIsmMetaData[nS]->pitch, Dir );



#ifndef FIX_463_TD_RENDERER_DIRECTIVITY_RESET



            /* Source directivity info */

            DirAtten_p->ConeInnerAngle = 360.0f;

            DirAtten_p->ConeOuterAngle = 360.0f;

            DirAtten_p->ConeOuterGain = 1.0f;

#endif



            TDREND_MIX_SRC_SetPos( hBinRendererTd, nS, Pos );

            TDREND_MIX_SRC_SetDirAtten( hBinRendererTd, nS, DirAtten_p );

lib_rend/lib_rend.c

+0 −2
Original line number Diff line number Diff line
@@ -3794,9 +3794,7 @@ int16_t IVAS_REND_GetRenderConfig( 
    hRCout->room_acoustics.nBands = hRCin->roomAcoustics.nBands;

    hRCout->room_acoustics.acousticPreDelay = hRCin->roomAcoustics.acousticPreDelay;

    hRCout->room_acoustics.inputPreDelay = hRCin->roomAcoustics.inputPreDelay;

#ifdef FIX_463_TD_RENDERER_DIRECTIVITY_RESET

    mvr2r( hRCin->directivity, hRCout->directivity, 3 );

#endif



    mvr2r( hRCin->roomAcoustics.pFc_input, hRCout->room_acoustics.pFc_input, CLDFB_NO_CHANNELS_MAX );

    mvr2r( hRCin->roomAcoustics.pAcoustic_rt60, hRCout->room_acoustics.pAcoustic_rt60, CLDFB_NO_CHANNELS_MAX );