From 5182c183b95b0f1a23b00eed811c187b83e331e0 Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Mon, 15 May 2023 08:06:37 +0200 Subject: [PATCH 1/2] Add fix for directivity pattern under FIX_463_TD_RENDERER_DIRECTIVITY_RESET --- lib_com/options.h | 1 + lib_rend/ivas_objectRenderer.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index e68aca0ef1..6b524c67b1 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -215,6 +215,7 @@ #endif #define COMPLEXITY_LEVEL_INDICATION +#define FIX_463_TD_RENDERER_DIRECTIVITY_RESET /* Eri: Remove unintentional reset of directivity pattern */ /* ################## End DEVELOPMENT switches ######################### */ /* clang-format on */ diff --git a/lib_rend/ivas_objectRenderer.c b/lib_rend/ivas_objectRenderer.c index 0618534448..92cfaabd71 100644 --- a/lib_rend/ivas_objectRenderer.c +++ b/lib_rend/ivas_objectRenderer.c @@ -435,10 +435,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 ); -- GitLab From 93283e8abeac3d1f8a9cafd364c2828e6b4bda04 Mon Sep 17 00:00:00 2001 From: Sumeyra Kanik Date: Tue, 16 May 2023 15:23:35 +0200 Subject: [PATCH 2/2] Fix for overriding initial directivity default values --- lib_rend/lib_rend.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib_rend/lib_rend.c b/lib_rend/lib_rend.c index c091ed15ff..671b7822ec 100644 --- a/lib_rend/lib_rend.c +++ b/lib_rend/lib_rend.c @@ -3740,6 +3740,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 ); @@ -3766,9 +3769,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 ) -- GitLab