Cleaned up the unused function ivas_sba_mtx_mult() (99e9518b) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_prot.h

+4 −2

Original line number	Diff line number	Diff line
		@@ -4137,8 +4137,10 @@ ivas_error ivas_sba_linear_renderer(
		const int16_t nchan_in, /* i : number of input ambisonics channels */
		const int16_t nchan_ism,
		const AUDIO_CONFIG output_config, /* i : output audio configuration */
		const IVAS_OUTPUT_SETUP output_setup, /* i : output format setup */
		const float hoa_dec_mtx[] /* i : HOA decoding mtx */
		const IVAS_OUTPUT_SETUP output_setup /* i : output format setup */
		#ifndef REMOVE_UNUSED_FUNCTION
		,const float hoa_dec_mtx[] /* i : HOA decoding mtx */
		#endif
		);

		void ivas_sba_mix_matrix_determiner(

lib_dec/ivas_dec.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -465,7 +465,12 @@ ivas_error ivas_dec(
		{
		if ( ( error = ivas_sba_linear_renderer( p_output, output_frame, nchan_remapped,
		0,
		output_config, st_ivas->hOutSetup, st_ivas->hoa_dec_mtx ) ) != IVAS_ERR_OK )
		output_config, st_ivas->hOutSetup
		#ifndef REMOVE_UNUSED_FUNCTION
		,
		st_ivas->hoa_dec_mtx
		#endif
		) ) != IVAS_ERR_OK )
		{
		return error;
		}

lib_dec/ivas_jbm_dec.c

+12 −7

Original line number	Diff line number	Diff line
		@@ -951,7 +951,12 @@ ivas_error ivas_jbm_dec_render(

		if ( ( error = ivas_sba_linear_renderer( p_output, *nSamplesRendered, nchan_remapped,
		0,
		output_config, st_ivas->hOutSetup, st_ivas->hoa_dec_mtx ) ) != IVAS_ERR_OK )
		output_config, st_ivas->hOutSetup
		#ifndef REMOVE_UNUSED_FUNCTION
		,
		st_ivas->hoa_dec_mtx
		#endif
		) ) != IVAS_ERR_OK )
		{
		return error;
		}

lib_dec/ivas_sba_dec.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -732,7 +732,12 @@ void ivas_sba_dec_render(
		{
		ivas_sba_linear_renderer( output_f, *nSamplesRendered, st_ivas->hIntSetup.nchan_out_woLFE,
		0,
		st_ivas->hDecoderConfig->output_config, st_ivas->hOutSetup, st_ivas->hoa_dec_mtx );
		st_ivas->hDecoderConfig->output_config, st_ivas->hOutSetup
		#ifndef REMOVE_UNUSED_FUNCTION
		,
		st_ivas->hoa_dec_mtx
		#endif
		);
		}

		if ( st_ivas->hDirAC != NULL && hSpar->slots_rendered == hSpar->num_slots )

lib_dec/ivas_sba_rendering_internal.c

+19 −9

Original line number	Diff line number	Diff line
		@@ -431,7 +431,12 @@ ivas_error ivas_sba_upmixer_renderer(
		output_f[ch] = output[ch];
		}

		if ( ( error = ivas_sba_linear_renderer( output_f, output_frame, st_ivas->hIntSetup.nchan_out_woLFE, st_ivas->nchan_ism, output_config, st_ivas->hOutSetup, st_ivas->hoa_dec_mtx ) ) != IVAS_ERR_OK )
		if ( ( error = ivas_sba_linear_renderer( output_f, output_frame, st_ivas->hIntSetup.nchan_out_woLFE, st_ivas->nchan_ism, output_config, st_ivas->hOutSetup
		#ifndef REMOVE_UNUSED_FUNCTION
		,
		st_ivas->hoa_dec_mtx
		#endif
		) ) != IVAS_ERR_OK )
		{
		return error;
		}
		@@ -441,7 +446,7 @@ ivas_error ivas_sba_upmixer_renderer(
		return IVAS_ERR_OK;
		}


		#ifndef REMOVE_UNUSED_FUNCTION
		/-------------------------------------------------------------------
		* ivas_sba_mtx_mult()
		*
		@@ -501,7 +506,7 @@ static void ivas_sba_mtx_mult(
		return;
		}


		#endif
		/-------------------------------------------------------------------
		* ivas_sba_linear_renderer()
		*
		@@ -514,8 +519,11 @@ ivas_error ivas_sba_linear_renderer(
		const int16_t nchan_in, /* i : number of input ambisonics channels */
		const int16_t nchan_ism,
		const AUDIO_CONFIG output_config, /* i : output audio configuration */
		const IVAS_OUTPUT_SETUP output_setup, /* i : output format setup */
		const IVAS_OUTPUT_SETUP output_setup /* i : output format setup */
		#ifndef REMOVE_UNUSED_FUNCTION
		,
		const float hoa_dec_mtx[] /* i : HOA decoding mtx */
		#endif
		)
		{
		int16_t i;
		@@ -565,6 +573,7 @@ ivas_error ivas_sba_linear_renderer(
		}
		}
		break;
		#ifndef REMOVE_UNUSED_FUNCTION
		case AUDIO_CONFIG_5_1:
		case AUDIO_CONFIG_7_1:
		case AUDIO_CONFIG_5_1_2:
		@@ -573,6 +582,7 @@ ivas_error ivas_sba_linear_renderer(
		case AUDIO_CONFIG_LS_CUSTOM:
		ivas_sba_mtx_mult( output_f, output_frame, nchan_hoa, output_setup, hoa_dec_mtx );
		break;
		#endif
		case AUDIO_CONFIG_FOA: /* Ambisonics output, order: 1 */
		case AUDIO_CONFIG_HOA2: /* Ambisonics output, order: 2 */
		case AUDIO_CONFIG_HOA3: /* Ambisonics output, order: 3 */