From ed6d9e1a466ffaddaa4fedcf3e6d0b7e5e8b93ac Mon Sep 17 00:00:00 2001 From: Vladimir Malenovsky Date: Thu, 27 Nov 2025 12:56:01 +0100 Subject: [PATCH 1/5] move multi-pose CLDFB ring buffer declarations --- lib_com/ivas_prot.h | 38 -------------------------------------- lib_rend/ivas_prot_rend.h | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/lib_com/ivas_prot.h b/lib_com/ivas_prot.h index 3699782aa7..4ac91d9667 100644 --- a/lib_com/ivas_prot.h +++ b/lib_com/ivas_prot.h @@ -5196,44 +5196,6 @@ void ivas_binaural_add_LFE( float *output_f[] /* o : synthesized core-coder transport channels/DirAC output */ ); -#ifdef FIX_1119_SPLIT_RENDERING_VOIP - -/*---------------------------------------------------------------------------------* - * Multi-pose ring buffer Prototypes -*-----------------------------------------------------------------------------------*/ - -ivas_error ivas_CLDFB_RINGBUF_Open( - ISAR_CLDFB_RINGBUF_HANDLE *ph, - const int16_t capacity_columns -); - -void ivas_CLDFB_RINGBUF_Close( - ISAR_CLDFB_RINGBUF_HANDLE *ph -); - -void ivas_CLDFB_RINGBUF_Push( - ISAR_CLDFB_RINGBUF_HANDLE h, - const float *real, - const float *imag, - const int16_t num_bands -); - -void ivas_CLDFB_RINGBUF_Pop( - ISAR_CLDFB_RINGBUF_HANDLE h, - float *real, - float *imag, - const int16_t num_bands -); - -void ivas_CLDFB_RINGBUF_GetByIdx( - ISAR_CLDFB_RINGBUF_HANDLE h, - float **p_real, - float **p_imag, - const int16_t idx -); - -#endif - /*----------------------------------------------------------------------------------* * renderer prototypes *----------------------------------------------------------------------------------*/ diff --git a/lib_rend/ivas_prot_rend.h b/lib_rend/ivas_prot_rend.h index 14c2e65941..775f6d7ead 100644 --- a/lib_rend/ivas_prot_rend.h +++ b/lib_rend/ivas_prot_rend.h @@ -1661,6 +1661,44 @@ int16_t 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 int16_t capacity_columns +); + +void ivas_CLDFB_RINGBUF_Close( + ISAR_CLDFB_RINGBUF_HANDLE *ph +); + +void ivas_CLDFB_RINGBUF_Push( + ISAR_CLDFB_RINGBUF_HANDLE h, + const float *real, + const float *imag, + const int16_t num_bands +); + +void ivas_CLDFB_RINGBUF_Pop( + ISAR_CLDFB_RINGBUF_HANDLE h, + float *real, + float *imag, + const int16_t num_bands +); + +void ivas_CLDFB_RINGBUF_GetByIdx( + ISAR_CLDFB_RINGBUF_HANDLE h, + float **p_real, + float **p_imag, + const int16_t idx +); + +#endif + /* clang-format on */ #endif /* IVAS_PROT_REND_H */ -- GitLab From 2600591831a5debc3a75a7958212efbf20ae417e Mon Sep 17 00:00:00 2001 From: Vladimir Malenovsky Date: Thu, 27 Nov 2025 13:12:17 +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 669227540e..c11052d206 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.h" #include "ivas_prot.h" +#include "ivas_prot_rend.h" #include #ifdef DEBUGGING #include "debug.h" -- GitLab From 91c60c09bf3d231f843c2996c0ad24968d6907e3 Mon Sep 17 00:00:00 2001 From: Vladimir Malenovsky Date: Fri, 28 Nov 2025 13:39:01 +0100 Subject: [PATCH 3/5] Apply 1 suggestion(s) to 1 file(s) Co-authored-by: Archit Tamarapu --- 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 c11052d206..84795c9ccb 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.h" -#include "ivas_prot.h" #include "ivas_prot_rend.h" #include #ifdef DEBUGGING -- GitLab From 19117c1089b66e30b771e835fc964c43a5ede1dc Mon Sep 17 00:00:00 2001 From: "Malenovsky, Vladimir" Date: Fri, 28 Nov 2025 14:03:05 +0100 Subject: [PATCH 4/5] remove already accepted #ifdef --- lib_rend/ivas_prot_rend.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib_rend/ivas_prot_rend.h b/lib_rend/ivas_prot_rend.h index b08d96ffaa..b9d03ec5ca 100644 --- a/lib_rend/ivas_prot_rend.h +++ b/lib_rend/ivas_prot_rend.h @@ -1627,8 +1627,6 @@ int16_t ivas_TD_RINGBUF_Size( const TD_RINGBUF_HANDLE h /* i : Ring buffer handle */ ); -#ifdef FIX_1119_SPLIT_RENDERING_VOIP - /*---------------------------------------------------------------------------------* * Multi-pose ring buffer Prototypes *-----------------------------------------------------------------------------------*/ @@ -1667,4 +1665,3 @@ void ivas_CLDFB_RINGBUF_GetByIdx( /* clang-format on */ -#endif /* IVAS_PROT_REND_H */ -- GitLab From 0a8c81bac8956eb29de7444a878fe381f2ae5c9c Mon Sep 17 00:00:00 2001 From: Vladimir Malenovsky Date: Fri, 28 Nov 2025 14:13:12 +0100 Subject: [PATCH 5/5] clang format --- lib_rend/ivas_prot_rend.h | 1 - 1 file changed, 1 deletion(-) diff --git a/lib_rend/ivas_prot_rend.h b/lib_rend/ivas_prot_rend.h index b9d03ec5ca..33cce693d0 100644 --- a/lib_rend/ivas_prot_rend.h +++ b/lib_rend/ivas_prot_rend.h @@ -1664,4 +1664,3 @@ void ivas_CLDFB_RINGBUF_GetByIdx( #endif /* clang-format on */ - -- GitLab