[cleanup] accept FIX_782_OSBA_FUNCTION_NAMES (045e736d) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_prot.h

+0 −15

Original line number	Diff line number	Diff line
		@@ -5710,19 +5710,10 @@ void ivas_osba_enc(
		const int16_t sba_planar /* i : planar SBA flag */
		);

		#ifdef FIX_782_OSBA_FUNCTION_NAMES
		ivas_error ivas_osba_data_open(
		#else
		ivas_error ivas_masa_ism_data_open(
		#endif
		Decoder_Struct st_ivas / i/o: IVAS decoder handle */
		);

		#ifndef FIX_782_OSBA_FUNCTION_NAMES
		ivas_error ivas_sba_ism_separate_object_renderer_open(
		Decoder_Struct st_ivas / i/o: IVAS decoder structure */
		);
		#endif

		#ifdef JBM_FOR_OSBA
		ivas_error ivas_osba_dirac_td_binaural_jbm(
		@@ -5754,15 +5745,9 @@ ivas_error ivas_osba_render(
		const int16_t output_frame /* i : output frame length per channel */
		);

		#ifdef FIX_782_OSBA_FUNCTION_NAMES
		void ivas_osba_data_close(
		SBA_ISM_DATA_HANDLE hSbaIsmData / i/o: OSBA rendering handle */
		);
		#else
		void ivas_masa_ism_data_close(
		MASA_ISM_DATA_HANDLE hMasaIsmData / i/o: MASA_ISM rendering handle */
		);
		#endif


		/----------------------------------------------------------------------------------

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -163,7 +163,6 @@
		#define FIX_708_DPID_COMMAND_LINE /* issue 708: sanity checks for '-dpid' command-line */
		#define FIX_730_DPID_NOT_SET_CORRECTLY /* Eri: issue 730: write dpid read from file in correct index, print informative error message when DPID specified is not found. */
		#define FIX_513_REND_MC_ALLOC /* FhG: issue 513, optimise external renderer allocation for multichannel */
		#define FIX_782_OSBA_FUNCTION_NAMES /* VA: fix 782: correct OSBA function names */
		#define PARAM_ISM_REFACTOR /* FhG: Issue 768: Refactoring to decouple hDirAC and hParamISM */
		#define FIX_678_ISM_SBA_ASAN /* FhG: Issue 678: ASAN in ISM to SBA conversion in JBM */
		#define FIX_676_JBM_USAN /* FhG: Issue 676: USAN in JBM */

lib_dec/ivas_dec.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -738,11 +738,7 @@ ivas_error ivas_dec(
		{
		for ( n = 0; n < nchan_ism; n++ )
		{
		#ifdef FIX_782_OSBA_FUNCTION_NAMES
		delay_signal( p_output[n], output_frame, st_ivas->hSbaIsmData->delayBuffer[n], st_ivas->hSbaIsmData->delayBuffer_size );
		#else
		delay_signal( output[n], output_frame, st_ivas->hMasaIsmData->delayBuffer[n], st_ivas->hMasaIsmData->delayBuffer_size );
		#endif
		}
		}
		#ifdef JBM_FOR_OSBA

lib_dec/ivas_init_dec.c

+0 −21

Original line number	Diff line number	Diff line
		@@ -1621,11 +1621,7 @@ ivas_error ivas_init_decoder(
		return error;
		}

		#ifdef FIX_782_OSBA_FUNCTION_NAMES
		if ( ( error = ivas_osba_data_open( st_ivas ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = ivas_masa_ism_data_open( st_ivas ) ) != IVAS_ERR_OK )
		#endif
		{
		return error;
		}
		@@ -2135,16 +2131,6 @@ ivas_error ivas_init_decoder(
		return error;
		}
		}
		#ifndef FIX_782_OSBA_FUNCTION_NAMES
		if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC )
		{
		/* Allocate 'hIsmRendererData' handle and memory for delay buffer within 'hMasaIsmData' */
		if ( ( error = ivas_sba_ism_separate_object_renderer_open( st_ivas ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		}
		#endif
		}

		/-----------------------------------------------------------------
		@@ -2518,9 +2504,7 @@ void ivas_initialize_handles_dec(
		st_ivas->hHrtfParambin = NULL;
		st_ivas->hoa_dec_mtx = NULL;
		st_ivas->hMasaIsmData = NULL;
		#ifdef FIX_782_OSBA_FUNCTION_NAMES
		st_ivas->hSbaIsmData = NULL;
		#endif

		st_ivas->hHeadTrackData = NULL;
		st_ivas->hHrtfTD = NULL;
		@@ -2729,13 +2713,8 @@ void ivas_destroy_dec(
		st_ivas->hMonoDmxRenderer = NULL;
		}

		#ifdef FIX_782_OSBA_FUNCTION_NAMES
		/* OSBA structure */
		ivas_osba_data_close( &st_ivas->hSbaIsmData );
		#else
		/* MASA ISM structure */
		ivas_masa_ism_data_close( &st_ivas->hMasaIsmData );
		#endif

		/* OMASA structure */
		ivas_omasa_data_close( &st_ivas->hMasaIsmData );

lib_dec/ivas_osba_dec.c

+0 −99

Original line number	Diff line number	Diff line
		@@ -43,7 +43,6 @@
		#include "wmc_auto.h"


		#ifdef FIX_782_OSBA_FUNCTION_NAMES
		/-------------------------------------------------------------------
		* ivas_osba_data_open()
		*
		@@ -117,96 +116,6 @@ void ivas_osba_data_close(

		return;
		}
		#else
		/-------------------------------------------------------------------
		* ivas_masa_ism_data_open()
		*
		* Allocate and initialize MASA_ISM rendering handle
		-------------------------------------------------------------------/

		ivas_error ivas_masa_ism_data_open(
		Decoder_Struct st_ivas / i/o: IVAS decoder handle */
		)
		{
		MASA_ISM_DATA_HANDLE hMasaIsmData;

		if ( ( hMasaIsmData = (MASA_ISM_DATA_HANDLE) malloc( sizeof( MASA_ISM_DATA ) ) ) == NULL )
		{
		return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MASA ISM data\n" ) );
		}
		hMasaIsmData->delayBuffer = NULL;

		st_ivas->hMasaIsmData = hMasaIsmData;

		return IVAS_ERR_OK;
		}


		/-------------------------------------------------------------------
		* ivas_masa_ism_data_close()
		*
		* Deallocate MASA_ISM rendering handle
		-------------------------------------------------------------------/

		void ivas_masa_ism_data_close(
		MASA_ISM_DATA_HANDLE hMasaIsmData / i/o: MASA_ISM rendering handle */
		)
		{
		int16_t i;

		if ( hMasaIsmData == NULL \|\| *hMasaIsmData == NULL )
		{
		return;
		}

		if ( ( *hMasaIsmData )->delayBuffer != NULL )
		{
		for ( i = 0; i < ( *hMasaIsmData )->delayBuffer_nchan; i++ )
		{
		free( ( *hMasaIsmData )->delayBuffer[i] );
		}
		free( ( *hMasaIsmData )->delayBuffer );
		( *hMasaIsmData )->delayBuffer = NULL;
		}

		free( *hMasaIsmData );
		*hMasaIsmData = NULL;

		return;
		}

		/-------------------------------------------------------------------------
		* ivas_sba_ism_separate_object_renderer_open()
		*
		* Open structures, reserve memory, and init values.
		-------------------------------------------------------------------------/

		ivas_error ivas_sba_ism_separate_object_renderer_open(
		Decoder_Struct st_ivas / i/o: IVAS decoder structure */
		)
		{
		int16_t i;

		st_ivas->hMasaIsmData->delayBuffer_nchan = st_ivas->nchan_ism;
		st_ivas->hMasaIsmData->delayBuffer_size = (int16_t) ( ( st_ivas->hDecoderConfig->output_Fs / 50 ) / MAX_PARAM_SPATIAL_SUBFRAMES );

		if ( ( st_ivas->hMasaIsmData->delayBuffer = (float *) malloc( st_ivas->hMasaIsmData->delayBuffer_nchan sizeof( float * ) ) ) == NULL )
		{
		return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for MASA ISM delay buffer \n" ) );
		}

		for ( i = 0; i < st_ivas->hMasaIsmData->delayBuffer_nchan; i++ )
		{
		if ( ( st_ivas->hMasaIsmData->delayBuffer[i] = (float ) malloc( st_ivas->hMasaIsmData->delayBuffer_size sizeof( float ) ) ) == NULL )
		{
		return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for MASA ISM delay buffer \n" ) );
		}
		set_zero( st_ivas->hMasaIsmData->delayBuffer[i], st_ivas->hMasaIsmData->delayBuffer_size );
		}

		return IVAS_ERR_OK;
		}
		#endif


		/--------------------------------------------------------------------------
		@@ -277,11 +186,7 @@ ivas_error ivas_osba_dirac_td_binaural(
		{
		for ( n = 0; n < st_ivas->nchan_ism; n++ )
		{
		#ifdef FIX_782_OSBA_FUNCTION_NAMES
		delay_signal( data_separated_objects[n], output_frame, st_ivas->hSbaIsmData->delayBuffer[n], st_ivas->hSbaIsmData->delayBuffer_size );
		#else
		delay_signal( data_separated_objects[n], output_frame, st_ivas->hMasaIsmData->delayBuffer[n], st_ivas->hMasaIsmData->delayBuffer_size );
		#endif
		}
		}

		@@ -446,11 +351,7 @@ ivas_error ivas_osba_render(
		for ( n = 0; n < nchan_ism; n++ )
		{
		mvr2r( output_f[n], tmp_ism_out[n], output_frame );
		#ifdef FIX_782_OSBA_FUNCTION_NAMES
		delay_signal( tmp_ism_out[n], output_frame, st_ivas->hSbaIsmData->delayBuffer[n], st_ivas->hSbaIsmData->delayBuffer_size );
		#else
		delay_signal( tmp_ism_out[n], output_frame, st_ivas->hMasaIsmData->delayBuffer[n], st_ivas->hMasaIsmData->delayBuffer_size );
		#endif
		}

		if ( st_ivas->renderer_type == RENDERER_OSBA_AMBI )