diff --git a/lib_com/options.h b/lib_com/options.h index 4b02b35f8bd21e106d9f232dbf1dbacbc8265a0f..a8ac16aa46e39db8c7103cfef4fd9fb3633279cb 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 */ #define NONBE_1894_OSBA_SCALING /* FhG: port OSBA scaling MRs (298,355,360) jointly */ diff --git a/lib_dec/ivas_binRenderer_internal.c b/lib_dec/ivas_binRenderer_internal.c index fd7c313db362f690041a503792d1b8d0a4cf99fa..146a029fc43db1884413c3fd4f659431dde722e7 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;