Merge branch 'main' into 744-fix-sofa-to-rom-tables-and-binaural-binary-files (4ca90741) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+130 −194

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/ivas_prot.h

+64 −53

Original line number	Diff line number	Diff line
		@@ -5684,14 +5684,19 @@ void ivas_osba_enc(
		#endif
		);

		#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
		ivas_error ivas_osba_dirac_td_binaural(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		float output[], / o : output synthesis signal */
		@@ -5711,9 +5716,15 @@ 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

+1 −0

Original line number	Diff line number	Diff line
		@@ -173,6 +173,7 @@
		#define FIX_764_HARM_CODE /* VA: issue 764: introduce new function for the same code block at four different places */
		#define FIX_747_ISM_TODOS /* VA: issue 747 - address ISM ToDos */
		#define FIX_ISMRENDERER_HANDLE_DEALLOC /* VA: issue 781: harmonize Deallocation of handle 'hIsmRendererData' */
		#define FIX_782_OSBA_FUNCTION_NAMES /* VA: fix 782: correct OSBA function names */


		#define FIX_INV_DIFFUSE_WEIGHT /* Orange : Fix error in energy compensation in late binaural reverb*/

lib_dec/ivas_dec.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -749,7 +749,11 @@ ivas_error ivas_dec(
		{
		for ( n = 0; n < nchan_ism; n++ )
		{
		delay_signal( p_output[n], output_frame, st_ivas->hMasaIsmData->delayBuffer[n], st_ivas->hMasaIsmData->delayBuffer_size );
		#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
		}
		}

lib_dec/ivas_init_dec.c

+18 −6

Original line number	Diff line number	Diff line
		@@ -1569,13 +1569,16 @@ 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;
		}
		}


		/* set CNA/CNG flags */
		ivas_sba_set_cna_cng_flag( st_ivas );
		}
		@@ -1681,7 +1684,7 @@ ivas_error ivas_init_decoder(

		st_ivas->nchan_transport = ivas_mc_ls_setup_get_num_channels( ivas_mc_map_output_config_to_mc_ls_setup( st_ivas->transport_config ) );
		st_ivas->nSCE = 0;
		st_ivas->nCPE = st_ivas->nchan_transport / 2;
		st_ivas->nCPE = st_ivas->nchan_transport / CPE_CHANNELS;

		st_ivas->element_mode_init = IVAS_CPE_MDCT;

		@@ -1715,7 +1718,7 @@ ivas_error ivas_init_decoder(
		}

		st_ivas->nSCE = 0;
		st_ivas->nCPE = MC_PARAMUPMIX_MAX_TRANSPORT_CHANS / 2;
		st_ivas->nCPE = MC_PARAMUPMIX_MAX_TRANSPORT_CHANS / CPE_CHANNELS;
		st_ivas->nchan_transport = MC_PARAMUPMIX_MAX_TRANSPORT_CHANS;

		if ( ( error = ivas_mc_paramupmix_dec_open( st_ivas ) ) != IVAS_ERR_OK )
		@@ -2080,7 +2083,7 @@ 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' */
		@@ -2089,6 +2092,7 @@ ivas_error ivas_init_decoder(
		return error;
		}
		}
		#endif
		}

		/-----------------------------------------------------------------
		@@ -2455,6 +2459,9 @@ 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;
		@@ -2668,8 +2675,13 @@ 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 );