Rename CLDFB ring buffer (2c5914ea) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_dec/cldfb_ring_buffer.c

+16 −16

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@

		#ifdef FIX_1119_SPLIT_RENDERING_VOIP

		struct CldfbRingBuffer {
		struct CldfbRingBuf {
		float* real;
		float* imag;
		uint32_t capacity;
		@@ -49,13 +49,13 @@ struct CldfbRingBuffer {
		int16_t is_full;
		};

		ivas_error CLDFB_RB_Open( CLDFB_RING_BUFFER_HANDLE *ph, int16_t capacity_columns )
		ivas_error CLDFB_RINGBUF_Open( CLDFB_RINGBUF_HANDLE *ph, int16_t capacity_columns )
		{
		CLDFB_RING_BUFFER_HANDLE h;
		CLDFB_RINGBUF_HANDLE h;
		int32_t capacity;
		capacity = capacity_columns * CLDFB_NO_CHANNELS_MAX;

		if ( ( h = malloc( sizeof( struct CldfbRingBuffer ) ) ) == NULL )
		if ( ( h = malloc( sizeof( struct CldfbRingBuf ) ) ) == NULL )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Failed to allocate memory for CLDFB ring buffer\n" );
		}
		@@ -80,9 +80,9 @@ ivas_error CLDFB_RB_Open( CLDFB_RING_BUFFER_HANDLE *ph, int16_t capacity_columns
		return IVAS_ERR_OK;
		}

		void CLDFB_RB_Close( CLDFB_RING_BUFFER_HANDLE *ph )
		void CLDFB_RINGBUF_Close( CLDFB_RINGBUF_HANDLE *ph )
		{
		CLDFB_RING_BUFFER_HANDLE h;
		CLDFB_RINGBUF_HANDLE h;

		if ( ph == NULL )
		{
		@@ -110,10 +110,10 @@ void CLDFB_RB_Close( CLDFB_RING_BUFFER_HANDLE *ph )
		return;
		}

		void CLDFB_RB_Push( CLDFB_RING_BUFFER_HANDLE h, const float* real, const float* imag, uint16_t num_bands )
		void CLDFB_RINGBUF_Push( CLDFB_RINGBUF_HANDLE h, const float* real, const float* imag, uint16_t num_bands )
		{
		assert( num_bands <= CLDFB_NO_CHANNELS_MAX );
		assert( !CLDFB_RB_IsFull( h ) );
		assert( !CLDFB_RINGBUF_IsFull( h ) );

		mvr2r( real, &h->real[h->write_pos], (int16_t) num_bands );
		mvr2r( imag, &h->imag[h->write_pos], (int16_t) num_bands );
		@@ -132,10 +132,10 @@ void CLDFB_RB_Push( CLDFB_RING_BUFFER_HANDLE h, const float* real, const float*
		return;
		}

		void CLDFB_RB_Pop( CLDFB_RING_BUFFER_HANDLE h, float* real, float* imag, uint16_t num_bands )
		void CLDFB_RINGBUF_Pop( CLDFB_RINGBUF_HANDLE h, float* real, float* imag, uint16_t num_bands )
		{
		assert( num_bands <= CLDFB_NO_CHANNELS_MAX );
		assert( !CLDFB_RB_IsEmpty( h ) );
		assert( !CLDFB_RINGBUF_IsEmpty( h ) );

		if ( real != NULL )
		{
		@@ -160,11 +160,11 @@ void CLDFB_RB_Pop( CLDFB_RING_BUFFER_HANDLE h, float* real, float* imag, uint16_
		return;
		}

		static uint32_t rb_num_floats( CLDFB_RING_BUFFER_HANDLE h )
		static uint32_t rb_num_floats( CLDFB_RINGBUF_HANDLE h )
		{
		uint16_t ret;

		if ( CLDFB_RB_IsFull( h ) )
		if ( CLDFB_RINGBUF_IsFull( h ) )
		{
		return h->capacity;
		}
		@@ -182,7 +182,7 @@ static uint32_t rb_num_floats( CLDFB_RING_BUFFER_HANDLE h )
		return ret;
		}

		int16_t CLDFB_RB_GetByIdx( CLDFB_RING_BUFFER_HANDLE h, float p_real, float p_imag, int16_t col_idx )
		int16_t CLDFB_RINGBUF_GetByIdx( CLDFB_RINGBUF_HANDLE h, float p_real, float p_imag, int16_t col_idx )
		{
		int32_t idx = col_idx * CLDFB_NO_CHANNELS_MAX;
		int32_t num_floats = (int32_t) rb_num_floats(h);
		@@ -210,17 +210,17 @@ int16_t CLDFB_RB_GetByIdx( CLDFB_RING_BUFFER_HANDLE h, float p_real, float p
		return 0;
		}

		int16_t CLDFB_RB_IsEmpty( CLDFB_RING_BUFFER_HANDLE h )
		int16_t CLDFB_RINGBUF_IsEmpty( CLDFB_RINGBUF_HANDLE h )
		{
		return (int16_t) ( h->read_pos == h->write_pos && !h->is_full );
		}

		int16_t CLDFB_RB_IsFull( CLDFB_RING_BUFFER_HANDLE h )
		int16_t CLDFB_RINGBUF_IsFull( CLDFB_RINGBUF_HANDLE h )
		{
		return h->is_full;
		}

		uint16_t CLDFB_RB_Size( CLDFB_RING_BUFFER_HANDLE h )
		uint16_t CLDFB_RINGBUF_Size( CLDFB_RINGBUF_HANDLE h )
		{
		return rb_num_floats( h ) / CLDFB_NO_CHANNELS_MAX;
		}

lib_dec/cldfb_ring_buffer.h

+11 −11

Original line number	Diff line number	Diff line
		@@ -30,31 +30,31 @@

		*******************************************************************************************************/

		#ifndef CLDFB_RING_BUFFER_H
		#define CLDFB_RING_BUFFER_H
		#ifndef CLDFB_RINGBUF_H
		#define CLDFB_RINGBUF_H

		#include "ivas_error.h"
		#include <stdint.h>

		#ifdef FIX_1119_SPLIT_RENDERING_VOIP

		typedef struct CldfbRingBuffer* CLDFB_RING_BUFFER_HANDLE;
		typedef struct CldfbRingBuf* CLDFB_RINGBUF_HANDLE;

		ivas_error CLDFB_RB_Open( CLDFB_RING_BUFFER_HANDLE *ph, int16_t capacity_columns );
		ivas_error CLDFB_RINGBUF_Open( CLDFB_RINGBUF_HANDLE *ph, int16_t capacity_columns );

		void CLDFB_RB_Close( CLDFB_RING_BUFFER_HANDLE *ph );
		void CLDFB_RINGBUF_Close( CLDFB_RINGBUF_HANDLE *ph );

		void CLDFB_RB_Push( CLDFB_RING_BUFFER_HANDLE h, const float* real, const float* imag, uint16_t num_bands );
		void CLDFB_RINGBUF_Push( CLDFB_RINGBUF_HANDLE h, const float* real, const float* imag, uint16_t num_bands );

		void CLDFB_RB_Pop( CLDFB_RING_BUFFER_HANDLE h, float* real, float* imag, uint16_t num_bands );
		void CLDFB_RINGBUF_Pop( CLDFB_RINGBUF_HANDLE h, float* real, float* imag, uint16_t num_bands );

		int16_t CLDFB_RB_GetByIdx( CLDFB_RING_BUFFER_HANDLE h, float p_real, float p_imag, int16_t idx );
		int16_t CLDFB_RINGBUF_GetByIdx( CLDFB_RINGBUF_HANDLE h, float p_real, float p_imag, int16_t idx );

		int16_t CLDFB_RB_IsEmpty( CLDFB_RING_BUFFER_HANDLE h );
		int16_t CLDFB_RINGBUF_IsEmpty( CLDFB_RINGBUF_HANDLE h );

		int16_t CLDFB_RB_IsFull( CLDFB_RING_BUFFER_HANDLE h );
		int16_t CLDFB_RINGBUF_IsFull( CLDFB_RINGBUF_HANDLE h );

		uint16_t CLDFB_RB_Size( CLDFB_RING_BUFFER_HANDLE h );
		uint16_t CLDFB_RINGBUF_Size( CLDFB_RINGBUF_HANDLE h );

		#endif /* FIX_1119_SPLIT_RENDERING_VOIP */
		#endif

lib_dec/ivas_dirac_dec.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1668,7 +1668,7 @@ static void binRenderer_split(
		for ( ch = 0; ch < nchan_out; ch++ )
		{
		#ifdef FIX_1119_SPLIT_RENDERING_VOIP
		CLDFB_RB_Push(
		CLDFB_RINGBUF_Push(
		hSplitBinRend->hMultiBinCldfbData[pos_idx * BINAURAL_CHANNELS + ch],
		Cldfb_RealBuffer_Binaural[pos_idx][ch][slot_idx],
		Cldfb_ImagBuffer_Binaural[pos_idx][ch][slot_idx],

lib_dec/ivas_mc_param_dec.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1787,7 +1787,7 @@ void ivas_param_mc_dec_render(
		for ( ch = 0; ch < nchan_out_cldfb; ch++ )
		{
		#ifdef FIX_1119_SPLIT_RENDERING_VOIP
		CLDFB_RB_Push(
		CLDFB_RINGBUF_Push(
		st_ivas->hSplitBinRend->hMultiBinCldfbData[pos_idx * BINAURAL_CHANNELS + ch],
		Cldfb_RealBuffer_Binaural[pos_idx][ch][slot_idx],
		Cldfb_ImagBuffer_Binaural[pos_idx][ch][slot_idx],

lib_dec/ivas_mc_paramupmix_dec.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -791,7 +791,7 @@ static void ivas_mc_paramupmix_dec_sf(
		for ( ch = 0; ch < st_ivas->hDecoderConfig->nchan_out; ch++ )
		{
		#ifdef FIX_1119_SPLIT_RENDERING_VOIP
		CLDFB_RB_Push(
		CLDFB_RINGBUF_Push(
		st_ivas->hSplitBinRend->hMultiBinCldfbData[pos_idx * BINAURAL_CHANNELS + ch],
		Cldfb_RealBuffer_Binaural[pos_idx][ch][slot_idx],
		Cldfb_ImagBuffer_Binaural[pos_idx][ch][slot_idx],