[cleanup] accept NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER (13620df9) · Commits · SA4 / Audio / IVAS BASOP

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -86,7 +86,6 @@

		/* #################### Start BASOP porting switches ############################ */

		#define NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER /* FhG: issue 1128: set output ambisonics order to input order for EXT output */
		#define FIX_1138_SBA_EXT_ERROR_PRINTOUT /* VA: issue 1138: Fix SBA EXT output call of audioCfg2channels() */
		#define NONBE_1244_FIX_SWB_BWE_MEMORY /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */
		#define FIX_745_FIX_DATA_TYPE_CONVERSION /* VA: issue 745: implicit data type conversion when calling IVAS_DEC_Configure() */

lib_dec/ivas_init_dec_fx.c

+0 −40

Original line number	Diff line number	Diff line
		@@ -52,14 +52,9 @@ static ivas_error ivas_read_format( Decoder_Struct st_ivas, Word16 num_bits_re

		static ivas_error doSanityChecks_IVAS( Decoder_Struct *st_ivas );

		#ifdef NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER
		static AUDIO_CONFIG ivas_set_audio_config_from_sba_order( const Word16 sba_order );
		#else
		static AUDIO_CONFIG ivas_set_output_config_from_sba_order( const Word16 sba_order );
		#endif


		#ifdef NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER
		/-------------------------------------------------------------------
		* ivas_set_audio_config_from_sba_order()
		*
		@@ -70,9 +65,6 @@ static AUDIO_CONFIG ivas_set_output_config_from_sba_order( const Word16 sba_orde
		static AUDIO_CONFIG ivas_set_audio_config_from_sba_order(
		const Word16 sba_order /* i : Ambisonic (SBA) order */
		)
		#else
		static AUDIO_CONFIG ivas_set_output_config_from_sba_order( const Word16 sba_order )
		#endif
		{
		AUDIO_CONFIG output_config;

		@@ -94,13 +86,9 @@ static AUDIO_CONFIG ivas_set_output_config_from_sba_order( const Word16 sba_orde
		move32();
		BREAK;
		default:
		#ifdef NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER
		output_config = IVAS_AUDIO_CONFIG_INVALID;
		move32();
		BREAK;
		#else
		assert( 0 );
		#endif
		}

		return output_config;
		@@ -634,11 +622,7 @@ ivas_error ivas_dec_setup(
		#ifndef NONBE_FIX_1052_SBA_EXT_FIX
		IF( EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )
		{
		#ifdef NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER
		st_ivas->hDecoderConfig->output_config = ivas_set_audio_config_from_sba_order( st_ivas->sba_order );
		#else
		st_ivas->hDecoderConfig->output_config = ivas_set_output_config_from_sba_order( st_ivas->sba_order );
		#endif
		st_ivas->hDecoderConfig->nchan_out = audioCfg2channels( st_ivas->hDecoderConfig->output_config );
		}
		#endif
		@@ -936,11 +920,7 @@ ivas_error ivas_dec_setup(
		#ifndef NONBE_FIX_1052_SBA_EXT_FIX
		IF( EQ_32( st_ivas->ivas_format, SBA_FORMAT ) && EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )
		{
		#ifdef NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER
		st_ivas->hDecoderConfig->output_config = ivas_set_audio_config_from_sba_order( st_ivas->sba_order );
		#else
		st_ivas->hDecoderConfig->output_config = ivas_set_output_config_from_sba_order( st_ivas->sba_order );
		#endif
		st_ivas->hDecoderConfig->nchan_out = audioCfg2channels( st_ivas->hDecoderConfig->output_config );
		}
		#endif
		@@ -1596,11 +1576,7 @@ ivas_error ivas_init_decoder_fx(
		ELSE IF( EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) )
		#endif
		{
		#ifdef NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER
		hDecoderConfig->nchan_out = audioCfg2channels( ivas_set_audio_config_from_sba_order( st_ivas->sba_order ) );
		#else
		hDecoderConfig->nchan_out = audioCfg2channels( IVAS_AUDIO_CONFIG_HOA3 );
		#endif
		move16();
		hDecoderConfig->nchan_out = add( hDecoderConfig->nchan_out, st_ivas->nchan_ism );
		move16();
		@@ -1635,7 +1611,6 @@ ivas_error ivas_init_decoder_fx(
		st_ivas->intern_config = st_ivas->transport_config;
		move32();
		}
		#ifdef NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER
		#ifdef NONBE_FIX_1052_SBA_EXT_FIX
		ELSE IF( output_config == IVAS_AUDIO_CONFIG_EXTERNAL && ( st_ivas->ivas_format == SBA_ISM_FORMAT \|\| st_ivas->ivas_format == SBA_FORMAT ) )
		#else
		@@ -1645,7 +1620,6 @@ ivas_error ivas_init_decoder_fx(
		st_ivas->intern_config = ivas_set_audio_config_from_sba_order( st_ivas->sba_order );
		ivas_output_init( &( st_ivas->hOutSetup ), st_ivas->intern_config );
		}
		#endif
		ELSE
		{
		ivas_output_init( &( st_ivas->hOutSetup ), output_config );
		@@ -1663,20 +1637,6 @@ ivas_error ivas_init_decoder_fx(
		st_ivas->hOutSetup.nchan_out_woLFE = audioCfg2channels( st_ivas->intern_config );
		move16();
		}
		#ifndef NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER
		test();
		IF( EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) && EQ_32( output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )
		{
		st_ivas->hOutSetup.ambisonics_order = SBA_HOA3_ORDER;
		move32();
		st_ivas->intern_config = IVAS_AUDIO_CONFIG_HOA3;
		move32();
		st_ivas->hOutSetup.output_config = IVAS_AUDIO_CONFIG_HOA3;
		move32();
		st_ivas->hOutSetup.nchan_out_woLFE = audioCfg2channels( IVAS_AUDIO_CONFIG_HOA3 );
		move16();
		}
		#endif

		/* Only initialize transport setup if it is used */
		IF( NE_32( st_ivas->transport_config, IVAS_AUDIO_CONFIG_INVALID ) )

lib_dec/ivas_output_config_fx.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -421,11 +421,7 @@ void ivas_renderer_select(
		*internal_config = IVAS_AUDIO_CONFIG_FOA;
		move16();
		}
		#ifdef NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER
		ELSE IF( NE_32( output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )
		#else
		IF( NE_32( output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )
		#endif
		{
		*internal_config = IVAS_AUDIO_CONFIG_HOA3;
		move16();