merge REMOVE_APA_BUFFER2 into REMOVE_APA_BUFFER (fda46f0d) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -166,7 +166,6 @@
		#define OPT_TC // separate heap memory from hTcBuffer->tcBuffer[]
		//#define FIX_OSBA_BR_SW_FLUSH // this is non-BE bugfix
		#define REMOVE_APA_BUFFER // remove hIvasDec->apaExecBuffer[]
		#define REMOVE_APA_BUFFER2

		#define MY_DEBUG
		#endif

lib_dec/ivas_jbm_dec.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -795,14 +795,14 @@ void ivas_jbm_dec_feed_tc_to_renderer(
		float data / i : time-scaled transport channels */
		)
		{
		#ifdef REMOVE_APA_BUFFER2
		#ifdef REMOVE_APA_BUFFER
		float apa_buff[12 * MAX_JBM_L_FRAME48k];
		#endif
		float data_f[MAX_CLDFB_DIGEST_CHANNELS][MAX_JBM_L_FRAME48k]; /* 'float' buffer for transport channels that will be directly converted with the CLDFB */
		float *p_data_f[MAX_CLDFB_DIGEST_CHANNELS];
		int16_t n, n_render_timeslots;

		#ifdef REMOVE_APA_BUFFER2
		#ifdef REMOVE_APA_BUFFER
		int16_t n_samp_full = ( NS2SA( st_ivas->hDecoderConfig->output_Fs, MAX_JBM_L_FRAME_NS ) );
		// mvr2r( data, apa_buff, min( st_ivas->hTcBuffer->nchan_transport_jbm, st_ivas->hTcBuffer->nchan_buffer_full ) * n_samp_full );
		mvr2r( data, apa_buff, st_ivas->hTcBuffer->nchan_transport_jbm * n_samp_full );

lib_dec/lib_dec.c

+16 −37

Original line number	Diff line number	Diff line
		@@ -88,7 +88,7 @@ struct IVAS_DEC
		int16_t tsm_max_scaling;
		int16_t timeScalingDone; /* have we done already one TSM in a 20ms frame? */
		float tsm_quality;
		#ifndef REMOVE_APA_BUFFER2
		#ifndef REMOVE_APA_BUFFER
		float apaExecBuffer; / Buffer for APA scaling */
		#endif
		PCMDSP_APA_HANDLE hTimeScaler;
		@@ -184,7 +184,7 @@ ivas_error IVAS_DEC_Open(
		}
		hIvasDec = *phIvasDec;
		hIvasDec->hVoIP = NULL;
		#ifndef REMOVE_APA_BUFFER2
		#ifndef REMOVE_APA_BUFFER
		hIvasDec->apaExecBuffer = NULL;
		#endif
		hIvasDec->hTimeScaler = NULL;
		@@ -384,7 +384,7 @@ void IVAS_DEC_Close(

		apa_exit( &( *phIvasDec )->hTimeScaler );

		#ifndef REMOVE_APA_BUFFER2
		#ifndef REMOVE_APA_BUFFER
		if ( ( *phIvasDec )->apaExecBuffer != NULL )
		{
		free( ( *phIvasDec )->apaExecBuffer );
		@@ -1287,7 +1287,7 @@ ivas_error IVAS_DEC_GetSamplesDecoder(

		st_ivas = hIvasDec->st_ivas;
		#ifdef LIB_DEC_REVISION
		#ifdef REMOVE_APA_BUFFER2
		#ifdef REMOVE_APA_BUFFER
		isInitialized_voip = hIvasDec->hTimeScaler != NULL;
		#else
		isInitialized_voip = hIvasDec->apaExecBuffer != NULL;
		@@ -1394,21 +1394,11 @@ ivas_error IVAS_DEC_GetSamplesDecoder(
		return IVAS_ERR_UNKNOWN;
		}

		#ifndef REMOVE_APA_BUFFER2
		#ifdef MY_DEBUG
		set_f( hIvasDec->apaExecBuffer, 0, nTransportChannels * APA_BUF_PER_CHANNEL );

		#endif
		#endif
		#ifdef REMOVE_APA_BUFFER
		/* move decoded audio buffers st_ivas->p_output_f[][] to a serial buffer hTcBuffer->tc_buffer[] */
		ivas_syn_output_f( st_ivas->p_output_f, hIvasDec->nSamplesFrame, nTransportChannels, st_ivas->hTcBuffer->tc_buffer );

		#ifdef REMOVE_APA_BUFFER2
		if ( apa_exec( hIvasDec->hTimeScaler, st_ivas->hTcBuffer->tc_buffer, hIvasDec->nSamplesFrame * nTransportChannels, (uint16_t) hIvasDec->tsm_max_scaling, st_ivas->hTcBuffer->tc_buffer, &nTimeScalerOutSamples ) != 0 )
		#else
		if ( apa_exec( hIvasDec->hTimeScaler, st_ivas->hTcBuffer->tc_buffer, hIvasDec->nSamplesFrame * nTransportChannels, (uint16_t) hIvasDec->tsm_max_scaling, hIvasDec->apaExecBuffer, &nTimeScalerOutSamples ) != 0 )
		#endif
		#else
		#ifdef LIB_DEC_REVISION
		ivas_syn_output_f( hIvasDec->st_ivas->p_output_f, hIvasDec->nSamplesFrame, nTransportChannels, hIvasDec->apaExecBuffer );
		@@ -1433,17 +1423,8 @@ ivas_error IVAS_DEC_GetSamplesDecoder(
		* Feed decoded transport channels samples to the renderer
		-----------------------------------------------------------------/

		#ifndef REMOVE_APA_BUFFER2
		#ifdef MY_DEBUG
		for ( int16_t ch = 0; ch < min( st_ivas->hTcBuffer->nchan_transport_jbm, st_ivas->hTcBuffer->nchan_buffer_full ); ch++ )
		{
		set_f( st_ivas->hTcBuffer->tc[ch], 0, hIvasDec->nSamplesFrame + hIvasDec->nSamplesFrame / 2 );
		}

		#endif
		#endif
		#ifdef LIB_DEC_REVISION
		#ifdef REMOVE_APA_BUFFER2
		#ifdef REMOVE_APA_BUFFER
		ivas_jbm_dec_feed_tc_to_renderer( st_ivas, nSamplesTcsScaled, &nResidualSamples, st_ivas->hTcBuffer->tc_buffer );
		#else
		ivas_jbm_dec_feed_tc_to_renderer( st_ivas, nSamplesTcsScaled, &nResidualSamples, hIvasDec->apaExecBuffer );
		@@ -1455,12 +1436,6 @@ ivas_error IVAS_DEC_GetSamplesDecoder(
		}
		#endif

		#ifndef REMOVE_APA_BUFFER2
		#ifdef MY_DEBUG
		set_f( hIvasDec->apaExecBuffer, 0, nTransportChannels * APA_BUF_PER_CHANNEL );

		#endif
		#endif
		if ( hIvasDec->st_ivas->hDecoderConfig->Opt_tsm )
		{
		/* feed residual samples to TSM for the next call */
		@@ -5092,7 +5067,9 @@ static ivas_error IVAS_DEC_VoIP_reconfigure(
		const uint16_t l_ts )
		#endif
		{
		#ifndef REMOVE_APA_BUFFER
		int16_t apa_buffer_size;
		#endif
		#ifdef LIB_DEC_REVISION
		uint16_t l_ts;

		@@ -5115,10 +5092,12 @@ static ivas_error IVAS_DEC_VoIP_reconfigure(
		float startQuality;

		startQuality = hIvasDec->tsm_quality;
		#ifdef JBM_MEMORY_OPTaa
		apa_buffer_size = MAX_JBM_L_FRAME48k;
		#ifndef REMOVE_APA_BUFFER
		#ifdef JBM_MEMORY_OPT
		apa_buffer_size = ( NS2SA( hIvasDec->st_ivas->hDecoderConfig->output_Fs, MAX_JBM_L_FRAME_NS ) );
		#else
		apa_buffer_size = APA_BUF_PER_CHANNEL;
		#endif
		#endif

		/* get current renderer type*/
		@@ -5166,7 +5145,7 @@ static ivas_error IVAS_DEC_VoIP_reconfigure(
		}
		}

		#ifndef REMOVE_APA_BUFFER2
		#ifndef REMOVE_APA_BUFFER
		if ( ( hIvasDec->apaExecBuffer = malloc( sizeof( float ) * apa_buffer_size * nTransportChannels ) ) == NULL )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate VoIP handle" );
		@@ -5189,10 +5168,10 @@ static ivas_error IVAS_DEC_VoIP_reconfigure(
		return IVAS_ERR_INIT_ERROR;
		}

		#ifndef REMOVE_APA_BUFFER2
		#ifndef REMOVE_APA_BUFFER
		/* realloc apa_exe_buffer */
		#ifdef JBM_MEMORY_OPTaa
		apa_buffer_size = MAX_JBM_L_FRAME48k;
		#ifdef JBM_MEMORY_OPT
		apa_buffer_size = ( NS2SA( st_ivas->hDecoderConfig->output_Fs, MAX_JBM_L_FRAME_NS ) );
		#else
		apa_buffer_size = APA_BUF_PER_CHANNEL;
		#endif