Commit b6635fa9 authored by norvell's avatar norvell
Browse files

Merge branch '463-td-renderer-directivity-unintentionally-reset' into 'main' 

[Non-BE] Add fix for directivity pattern under FIX_463_TD_RENDERER_DIRECTIVITY_RESET

See merge request !644
parents 6bceabd5 643415b9

lib_com/options.h

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




#define COMPLEXITY_LEVEL_INDICATION

#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*/

lib_rend/ivas_objectRenderer.c

+2 −0
Original line number Diff line number Diff line
@@ -484,10 +484,12 @@ void TDREND_Update_object_positions( 
            /* Source position and direction */

            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

+4 −2
Original line number Diff line number Diff line
@@ -3793,6 +3793,9 @@ 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 );
@@ -3819,9 +3822,8 @@ int16_t IVAS_REND_FeedRenderConfig( 
    {

        return IVAS_ERR_UNEXPECTED_NULL_POINTER;

    }



    hRenderConfig = hIvasRend->hRendererConfig;

    mvr2r( renderConfig.directivity, hRenderConfig->directivity, 3 );



#ifdef DEBUGGING

    hRenderConfig->renderer_type_override = RENDER_TYPE_OVERRIDE_NONE;

    if ( renderConfig.renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_FASTCONV )