From d4e87659c08c74b42345d4637735b129d430d885 Mon Sep 17 00:00:00 2001 From: vaclav Date: Tue, 4 Jun 2024 10:37:42 +0200 Subject: [PATCH 1/3] fix binaural_latency_ns parameter in function ivas_rend_openCldfbRend(); under FIX_1113_CLDFB_REND_IN_ISAR --- lib_com/options.h | 2 +- lib_dec/ivas_binRenderer_internal.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index 2a27615681..d96fdaa97f 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -177,7 +177,7 @@ #define FIX_1068_ASAN_IN_MC_2_BINAURAL_ROOM_IR /* issue 1068 : Memory leak in MC to BINAURAL_ROOM decoding with bitrate switching*/ #define FIX_1050_EFAP_ALLOC /* FhG: issue 1050: reduction of memory allocated to EFAP handle */ #define FIX_1099_JBM_MD_HANDLE_ALLOC /* VA: issue 1099: Limit the allocation of `hJbmMetadata` handle to MASA and OMASA only */ - +#define FIX_1113_CLDFB_REND_IN_ISAR /* issue 1113: fix the use of CLDFB renderer in split-rendering at the external renderer */ /* #################### End BE switches ################################## */ diff --git a/lib_dec/ivas_binRenderer_internal.c b/lib_dec/ivas_binRenderer_internal.c index 7258a68489..f0590bf96f 100644 --- a/lib_dec/ivas_binRenderer_internal.c +++ b/lib_dec/ivas_binRenderer_internal.c @@ -1096,7 +1096,11 @@ ivas_error 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 From c2a6d7851b71b70686d54ed8ea6f85458e70e8dd Mon Sep 17 00:00:00 2001 From: Archit Tamarapu Date: Thu, 20 Jun 2024 15:50:28 +0200 Subject: [PATCH 2/3] [fix] move setting of cldfb_in_flag outside so it is independent of whether a render config file was provided --- apps/renderer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/renderer.c b/apps/renderer.c index 42ed96ce73..f27fdf5039 100644 --- a/apps/renderer.c +++ b/apps/renderer.c @@ -1137,12 +1137,12 @@ int main( #endif exit( -1 ); } + } #ifdef SPLIT_REND_WITH_HEAD_ROT - CLDFBframeSize_smpls = frameSize_smpls * 2; - cldfb_in_flag = get_cldfb_in_flag( args.outConfig.audioConfig, &renderConfig ); + CLDFBframeSize_smpls = frameSize_smpls * 2; + cldfb_in_flag = get_cldfb_in_flag( args.outConfig.audioConfig, &renderConfig ); #endif - } if ( ( error = IVAS_REND_SetOrientationTrackingMode( hIvasRend, args.orientation_tracking ) ) != IVAS_ERR_OK ) { -- GitLab From fb6b13ed6d53c62505b7e4fe000bf3eecf4efed7 Mon Sep 17 00:00:00 2001 From: vaclav Date: Fri, 21 Jun 2024 11:33:15 +0200 Subject: [PATCH 3/3] revert the previous debugging fix from @tamarapu --- apps/renderer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/renderer.c b/apps/renderer.c index f27fdf5039..42ed96ce73 100644 --- a/apps/renderer.c +++ b/apps/renderer.c @@ -1137,12 +1137,12 @@ int main( #endif exit( -1 ); } - } #ifdef SPLIT_REND_WITH_HEAD_ROT - CLDFBframeSize_smpls = frameSize_smpls * 2; - cldfb_in_flag = get_cldfb_in_flag( args.outConfig.audioConfig, &renderConfig ); + CLDFBframeSize_smpls = frameSize_smpls * 2; + cldfb_in_flag = get_cldfb_in_flag( args.outConfig.audioConfig, &renderConfig ); #endif + } if ( ( error = IVAS_REND_SetOrientationTrackingMode( hIvasRend, args.orientation_tracking ) ) != IVAS_ERR_OK ) { -- GitLab