Commit 21779423 authored Nov 08, 2022 by multrus

[cleanup] accept SPAR_STEREO_NO_DIRAC

parent 7b39f63c

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -145,7 +145,6 @@
		/#define FIX_I4_OL_PITCH/ /* fix open-loop pitch used for EVS core switching */
		#define FIX_I1_113 /* under review : MCT bit distribution optimization for SBA high bitrates*/
		#define PRINT_SBA_ORDER /* Issue 179: print-out also the SBA order of IVAS SBA format to stdout */
		#define SPAR_STEREO_NO_DIRAC /* Issue 180: skip DirAC processing channels for stereo output */
		#define AGC_TUNING_IMPROVEMENT /* Issue 168: Enable AGC for low bit rate (1 TC) */
		#ifdef AGC_TUNING_IMPROVEMENT
		#define AGC_ENABLE_FOR_LBR /* Issue 168: Enable AGC for low bit rate (1 TC) */

lib_dec/ivas_init_dec.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -804,9 +804,7 @@ ivas_error ivas_init_decoder(
		}

		if ( hDecoderConfig->output_config != AUDIO_CONFIG_FOA
		#ifdef SPAR_STEREO_NO_DIRAC
		&& st_ivas->hDecoderConfig->output_config != AUDIO_CONFIG_STEREO && st_ivas->hDecoderConfig->output_config != AUDIO_CONFIG_MONO
		#endif
		)
		{
		if ( ( error = ivas_dirac_dec_open( st_ivas ) ) != IVAS_ERR_OK )

lib_dec/ivas_output_init.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -515,12 +515,10 @@ void ivas_renderer_select(
		{
		*internal_config = output_config;
		}
		#ifdef SPAR_STEREO_NO_DIRAC
		else if ( output_config == AUDIO_CONFIG_MONO \|\| output_config == AUDIO_CONFIG_STEREO )
		{
		*internal_config = AUDIO_CONFIG_FOA;
		}
		#endif
		else
		{
		*internal_config = AUDIO_CONFIG_HOA3;

lib_dec/ivas_spar_decoder.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -1133,9 +1133,7 @@ void ivas_spar_dec_upmixer(
		}

		if ( hDecoderConfig->output_config != AUDIO_CONFIG_FOA
		#ifdef SPAR_STEREO_NO_DIRAC
		&& hDecoderConfig->output_config != AUDIO_CONFIG_STEREO && hDecoderConfig->output_config != AUDIO_CONFIG_MONO
		#endif
		)
		{
		ivas_dirac_dec( st_ivas, output, nchan_internal, cldfb_in_ts_re, cldfb_in_ts_im, i_sf );