Commit 964def59 authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

Merge branch '1460-float-multi-pose-ring-buffer-declarations-should-be-moved' into 'main' 

Resolve "Multi-pose ring buffer declarations should be moved"

See merge request !2429
parents 59928166 a524c126

lib_com/ivas_prot.h

+0 −36
Original line number Diff line number Diff line
@@ -5187,42 +5187,6 @@ void ivas_binaural_add_LFE( 
    float *output_f[]                                           /* o  : synthesized core-coder transport channels/DirAC output  */

);





/*---------------------------------------------------------------------------------*

 * 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 

);





/*----------------------------------------------------------------------------------*

 * renderer prototypes

 *----------------------------------------------------------------------------------*/

lib_rend/ivas_cldfb_ring_buffer.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
#include "options.h"

#include "cnst.h"

#include "prot.h"

#include "ivas_prot.h"

#include "ivas_prot_rend.h"

#include <assert.h>

#ifdef DEBUGGING

#include "debug.h"

lib_rend/ivas_prot_rend.h

+36 −2
Original line number Diff line number Diff line
@@ -1627,6 +1627,40 @@ int16_t ivas_TD_RINGBUF_Size( 
    const TD_RINGBUF_HANDLE h                                   /* i  : Ring buffer handle                      */

);



/* clang-format on */

/*---------------------------------------------------------------------------------*

 * 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 

);



#endif /* IVAS_PROT_REND_H */
 
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 */