From fecb3ab35304ba584a52d48008d7715f2f2a9931 Mon Sep 17 00:00:00 2001 From: Vladimir Malenovsky Date: Thu, 27 Nov 2025 13:00:22 +0100 Subject: [PATCH 1/5] move multi-pose CLDFB ring buffer declarations --- lib_com/ivas_prot_fx.h | 38 ------------------------------------ lib_rend/ivas_prot_rend_fx.h | 38 ++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/lib_com/ivas_prot_fx.h b/lib_com/ivas_prot_fx.h index b75b38137..cafb67425 100644 --- a/lib_com/ivas_prot_fx.h +++ b/lib_com/ivas_prot_fx.h @@ -6695,44 +6695,6 @@ void ivas_binaural_hrtf_close_fx( HRTFS_FASTCONV_HANDLE *hHrtfFastConv /* i/o: decoder binaural hrtf handle */ ); -#ifdef FIX_1119_SPLIT_RENDERING_VOIP - -/*---------------------------------------------------------------------------------* - * Multi-pose ring buffer Prototypes -*-----------------------------------------------------------------------------------*/ - -ivas_error ivas_CLDFB_RINGBUF_Open( - ISAR_CLDFB_RINGBUF_HANDLE *ph, - const Word16 capacity_columns -); - -void ivas_CLDFB_RINGBUF_Close( - ISAR_CLDFB_RINGBUF_HANDLE *ph -); - -void ivas_CLDFB_RINGBUF_Push( - ISAR_CLDFB_RINGBUF_HANDLE h, - const Word32 *real, - const Word32 *imag, - const Word16 num_bands -); - -void ivas_CLDFB_RINGBUF_Pop( - ISAR_CLDFB_RINGBUF_HANDLE h, - Word32 *real, - Word32 *imag, - const Word16 num_bands -); - -void ivas_CLDFB_RINGBUF_GetByIdx( - ISAR_CLDFB_RINGBUF_HANDLE h, - Word32 **p_real, - Word32 **p_imag, - const Word16 idx -); - -#endif - /*----------------------------------------------------------------------------------* * renderer prototypes *----------------------------------------------------------------------------------*/ diff --git a/lib_rend/ivas_prot_rend_fx.h b/lib_rend/ivas_prot_rend_fx.h index fed740577..499378a8c 100644 --- a/lib_rend/ivas_prot_rend_fx.h +++ b/lib_rend/ivas_prot_rend_fx.h @@ -1669,6 +1669,44 @@ Word16 ivas_TD_RINGBUF_Size( const TD_RINGBUF_HANDLE h /* i : Ring buffer handle */ ); +#ifdef FIX_1119_SPLIT_RENDERING_VOIP + +/*---------------------------------------------------------------------------------* + * Multi-pose ring buffer Prototypes +*-----------------------------------------------------------------------------------*/ + +ivas_error ivas_CLDFB_RINGBUF_Open( + ISAR_CLDFB_RINGBUF_HANDLE *ph, + const Word16 capacity_columns +); + +void ivas_CLDFB_RINGBUF_Close( + ISAR_CLDFB_RINGBUF_HANDLE *ph +); + +void ivas_CLDFB_RINGBUF_Push( + ISAR_CLDFB_RINGBUF_HANDLE h, + const Word32 *real, + const Word32 *imag, + const Word16 num_bands +); + +void ivas_CLDFB_RINGBUF_Pop( + ISAR_CLDFB_RINGBUF_HANDLE h, + Word32 *real, + Word32 *imag, + const Word16 num_bands +); + +void ivas_CLDFB_RINGBUF_GetByIdx( + ISAR_CLDFB_RINGBUF_HANDLE h, + Word32 **p_real, + Word32 **p_imag, + const Word16 idx +); + +#endif + /* clang-format on */ #endif /* IVAS_PROT_REND_H */ -- GitLab From ba2a5d94830515cb93b44d0b06ca191e47906b37 Mon Sep 17 00:00:00 2001 From: Vladimir Malenovsky Date: Thu, 27 Nov 2025 13:12:51 +0100 Subject: [PATCH 2/5] add the right header file --- lib_rend/ivas_cldfb_ring_buffer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib_rend/ivas_cldfb_ring_buffer.c b/lib_rend/ivas_cldfb_ring_buffer.c index 49d88e8f3..4526ac2e0 100644 --- a/lib_rend/ivas_cldfb_ring_buffer.c +++ b/lib_rend/ivas_cldfb_ring_buffer.c @@ -35,6 +35,7 @@ #include "cnst.h" #include "prot_fx.h" #include "ivas_prot_fx.h" +#include "ivas_prot_rend_fx.h" #include #ifdef DEBUGGING #include "debug.h" -- GitLab From e79a4a5778bff20df4e2fe890d726981ce60d0bc Mon Sep 17 00:00:00 2001 From: Vladimir Malenovsky Date: Fri, 28 Nov 2025 13:56:40 +0100 Subject: [PATCH 3/5] remove obsolete include --- lib_rend/ivas_cldfb_ring_buffer.c | 1 - 1 file changed, 1 deletion(-) diff --git a/lib_rend/ivas_cldfb_ring_buffer.c b/lib_rend/ivas_cldfb_ring_buffer.c index 358eb41cf..07f38590c 100644 --- a/lib_rend/ivas_cldfb_ring_buffer.c +++ b/lib_rend/ivas_cldfb_ring_buffer.c @@ -34,7 +34,6 @@ #include "options.h" #include "cnst.h" #include "prot_fx.h" -#include "ivas_prot_fx.h" #include "ivas_prot_rend_fx.h" #include #ifdef DEBUGGING -- GitLab From ae95d91651141a3aecc68310fcbd4257d5f326b7 Mon Sep 17 00:00:00 2001 From: Vladimir Malenovsky Date: Fri, 28 Nov 2025 14:01:39 +0100 Subject: [PATCH 4/5] remove accepted #ifdef --- lib_rend/ivas_prot_rend_fx.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib_rend/ivas_prot_rend_fx.h b/lib_rend/ivas_prot_rend_fx.h index e66f4e070..d7af3e3f4 100644 --- a/lib_rend/ivas_prot_rend_fx.h +++ b/lib_rend/ivas_prot_rend_fx.h @@ -1648,8 +1648,6 @@ Word16 ivas_TD_RINGBUF_Size( const TD_RINGBUF_HANDLE h /* i : Ring buffer handle */ ); -#ifdef FIX_1119_SPLIT_RENDERING_VOIP - /*---------------------------------------------------------------------------------* * Multi-pose ring buffer Prototypes *-----------------------------------------------------------------------------------*/ @@ -1688,4 +1686,3 @@ void ivas_CLDFB_RINGBUF_GetByIdx( /* clang-format on */ -#endif /* IVAS_PROT_REND_H */ -- GitLab From cbf13d7fa6fc42120d69c86860cd459e81d9b730 Mon Sep 17 00:00:00 2001 From: Vladimir Malenovsky Date: Fri, 28 Nov 2025 14:14:06 +0100 Subject: [PATCH 5/5] clang format --- lib_rend/ivas_prot_rend_fx.h | 1 - 1 file changed, 1 deletion(-) diff --git a/lib_rend/ivas_prot_rend_fx.h b/lib_rend/ivas_prot_rend_fx.h index d7af3e3f4..19b827c87 100644 --- a/lib_rend/ivas_prot_rend_fx.h +++ b/lib_rend/ivas_prot_rend_fx.h @@ -1685,4 +1685,3 @@ void ivas_CLDFB_RINGBUF_GetByIdx( #endif /* clang-format on */ - -- GitLab