From a33deb2baaff9f515b8e2835c354fa08c45995dc Mon Sep 17 00:00:00 2001 From: Stefan Bayer Date: Thu, 17 Aug 2023 09:56:17 +0200 Subject: [PATCH 1/3] fix MD update flag in teh TD object renderer in the JBM path (fixes #718) --- lib_com/options.h | 2 ++ lib_dec/ivas_objectRenderer_internal.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index b556709497..588b20ed01 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -158,6 +158,8 @@ #define OSBA_SPLIT_RENDERING #endif +#define FIX_718_JBM_MD_UDPATE /* Fhg: fix issue #718, wrong setting of the update flag in the TD obj renderer in the JBM path */ + /* ################## End BE DEVELOPMENT switches ######################### */ diff --git a/lib_dec/ivas_objectRenderer_internal.c b/lib_dec/ivas_objectRenderer_internal.c index eb04843b3d..6543f4a318 100644 --- a/lib_dec/ivas_objectRenderer_internal.c +++ b/lib_dec/ivas_objectRenderer_internal.c @@ -233,7 +233,11 @@ ivas_error ivas_td_binaural_renderer_sf( } /* Render subframe */ +#ifdef FIX_718_JBM_MD_UDPATE + if ( ( error = TDREND_GetMix( st_ivas->hBinRendererTd, output_f_local, output_frame, 0, ism_md_subframe_update_jbm != subframe_idx ) ) != IVAS_ERR_OK ) +#else if ( ( error = TDREND_GetMix( st_ivas->hBinRendererTd, output_f_local, output_frame, 0, ism_md_subframe_update_jbm ) ) != IVAS_ERR_OK ) +#endif { return error; } -- GitLab From 43c37d4a739fa423c5841615ea0f5a37342a5326 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Thu, 17 Aug 2023 14:54:33 +0200 Subject: [PATCH 2/3] add comment --- lib_dec/ivas_objectRenderer_internal.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib_dec/ivas_objectRenderer_internal.c b/lib_dec/ivas_objectRenderer_internal.c index 6543f4a318..4472b779e4 100644 --- a/lib_dec/ivas_objectRenderer_internal.c +++ b/lib_dec/ivas_objectRenderer_internal.c @@ -234,6 +234,8 @@ ivas_error ivas_td_binaural_renderer_sf( /* Render subframe */ #ifdef FIX_718_JBM_MD_UDPATE + /* ism_md_subframe_update_jbm != subframe_idx: trigger update only for ism_md_subframe_update_jbm == subframe_idx, + where then the two TDREND_GetMix()-arguments subframe_idx and ism_md_subframe_update are both 0 */ if ( ( error = TDREND_GetMix( st_ivas->hBinRendererTd, output_f_local, output_frame, 0, ism_md_subframe_update_jbm != subframe_idx ) ) != IVAS_ERR_OK ) #else if ( ( error = TDREND_GetMix( st_ivas->hBinRendererTd, output_f_local, output_frame, 0, ism_md_subframe_update_jbm ) ) != IVAS_ERR_OK ) -- GitLab From 93ac1f6d9609ea37ef30a88207ff1a0fd9926745 Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Thu, 17 Aug 2023 15:06:18 +0200 Subject: [PATCH 3/3] Correction of commen in FIX_718_JBM_MD_UDPATE --- lib_dec/ivas_objectRenderer_internal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_dec/ivas_objectRenderer_internal.c b/lib_dec/ivas_objectRenderer_internal.c index 4472b779e4..a7cbdd849f 100644 --- a/lib_dec/ivas_objectRenderer_internal.c +++ b/lib_dec/ivas_objectRenderer_internal.c @@ -235,7 +235,7 @@ ivas_error ivas_td_binaural_renderer_sf( /* Render subframe */ #ifdef FIX_718_JBM_MD_UDPATE /* ism_md_subframe_update_jbm != subframe_idx: trigger update only for ism_md_subframe_update_jbm == subframe_idx, - where then the two TDREND_GetMix()-arguments subframe_idx and ism_md_subframe_update are both 0 */ + where then the two TDREND_GetMix()-arguments subframe_idx and ism_md_subframe_update are equal, and we want to enforce the update inside TDREND_GetMix to use subframe_idx == 0 */ if ( ( error = TDREND_GetMix( st_ivas->hBinRendererTd, output_f_local, output_frame, 0, ism_md_subframe_update_jbm != subframe_idx ) ) != IVAS_ERR_OK ) #else if ( ( error = TDREND_GetMix( st_ivas->hBinRendererTd, output_f_local, output_frame, 0, ism_md_subframe_update_jbm ) ) != IVAS_ERR_OK ) -- GitLab