From f4ede361118ee89744b73ebe3496ddfcc9e09ac1 Mon Sep 17 00:00:00 2001 From: vaclav Date: Tue, 12 Aug 2025 14:46:47 +0200 Subject: [PATCH] port MR; under FIX_1113_CLDFB_REND_IN_ISAR --- lib_com/options.h | 1 + lib_dec/ivas_binRenderer_internal.c | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index 218c6a4ab..dc9641830 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -205,6 +205,7 @@ #define NONBE_FIX_981_PARAMBIN_DEFAULT_EARLY_PART /* Nokia: Set default early part energy correction to unity for BINAURAL_ROOM_REVERB */ #define NONBE_FIX_1174_MCMASA_LBR_LOOP_ERROR /* Nokia: Fix issue 1174 by removing the unnecessary inner loop causing problems. */ #define NONBE_FIX_1052_SBA_EXT_FIX /* VA: SBA external output support fix - do not overwrite "output_config" parameter */ +#define FIX_1113_CLDFB_REND_IN_ISAR /* issue 1113: fix the use of CLDFB renderer in split-rendering at the external renderer */ /* #################### End BASOP porting switches ############################ */ diff --git a/lib_dec/ivas_binRenderer_internal.c b/lib_dec/ivas_binRenderer_internal.c index fd7c313db..146a029fc 100644 --- a/lib_dec/ivas_binRenderer_internal.c +++ b/lib_dec/ivas_binRenderer_internal.c @@ -950,8 +950,7 @@ static void ivas_binaural_obtain_DMX( * Allocate and initialize CLDFB fast conv renderer handle *------------------------------------------------------------------------*/ -ivas_error -ivas_rend_openCldfbRend( +ivas_error ivas_rend_openCldfbRend( CLDFB_REND_WRAPPER *pCldfbRend, const AUDIO_CONFIG inConfig, const AUDIO_CONFIG outConfig, @@ -1027,7 +1026,11 @@ ivas_rend_openCldfbRend( return error; } +#ifdef FIX_1113_CLDFB_REND_IN_ISAR + pCldfbRend->binaural_latency_ns = (int32_t) ( pCldfbRend->hHrtfFastConv->FASTCONV_HOA3_latency_s * 1000000000.f ); +#else pCldfbRend->binaural_latency_ns = (int32_t) ( FASTCONV_HOA3_latency_s * 1000000000.f ); +#endif hBinRenderer->hReverb = NULL; hBinRenderer->hEFAPdata = NULL; -- GitLab