formatting (0689ef2c) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/encoder.c

+0 −9

Original line number	Diff line number	Diff line
		@@ -234,7 +234,6 @@ int main(
		goto cleanup;
		}


		/------------------------------------------------------------------------------------------
		* Open output bitstream file
		------------------------------------------------------------------------------------------/
		@@ -492,7 +491,6 @@ int main(
		goto cleanup;
		}


		/* Validate number of channels */
		int16_t encInNumChannels = 0;
		if ( ( error = IVAS_ENC_GetNumInChannels( hIvasEnc, &encInNumChannels ) ) != IVAS_ERR_OK )
		@@ -603,7 +601,6 @@ int main(
		int16_t numSamplesRead = 0;
		uint16_t bitStream[IVAS_MAX_BITS_PER_FRAME];
		uint16_t numBits = 0;

		#ifdef DEBUG_SBA
		#ifdef DEBUG_AGC
		ivas_open_agc_debug_files( (int16_t) arg.agc );
		@@ -725,7 +722,6 @@ int main(
		}
		}
		#endif

		/* Read ISM input metadata */
		for ( i = 0; i < numIsmInputs; ++i )
		{
		@@ -803,7 +799,6 @@ int main(
		#ifdef DEBUGGING
		print_snr();
		#endif

		/------------------------------------------------------------------------------------------
		* Close files and deallocate resources
		------------------------------------------------------------------------------------------/
		@@ -856,7 +851,6 @@ cleanup:
		print_wmops();
		print_mem( NULL );
		#endif

		#ifdef DEBUGGING
		dbgclose();

		@@ -1606,7 +1600,6 @@ static bool parseCmdlIVAS_enc(
		usage_enc();
		}
		}

		else if ( strcmp( to_upper( argv[i] ), "-ISM_SBA" ) == 0 )
		{
		arg->inputFormat = IVAS_ENC_INPUT_SBA_ISM;
		@@ -1695,7 +1688,6 @@ static bool parseCmdlIVAS_enc(
		}
		}
		}

		else if ( strcmp( argv_to_upper, "-STEREO_DMX_EVS" ) == 0 )
		{
		arg->inputFormat = IVAS_ENC_INPUT_MONO;
		@@ -1932,7 +1924,6 @@ static void usage_enc( void )
		fprintf( stdout, "-mime : Mime output bitstream file format\n" );
		fprintf( stdout, " The encoder produces TS26.445 Annex.2.6 Mime Storage Format, (not RFC4867 Mime Format).\n" );
		fprintf( stdout, " default output bitstream file format is G.192\n" );

		fprintf( stdout, "-bypass mode : SBA PCA by-pass, mode = (1, 2), 1 = PCA off, 2 = signal adaptive, default is 1\n" );
		fprintf( stdout, "-level level : Complexity level, level = (1, 2, 3), will be defined after characterisation. \n" );
		fprintf( stdout, " Currently, all values default to level 3 (full functionality).\n" );

apps/renderer.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1851,11 +1851,11 @@ int main(

		if ( delayNumSamples == -1 )
		{
		if ( args.delayCompensationEnabled
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		&& !is_split_pre_rend_mode( &args )
		if ( args.delayCompensationEnabled && !is_split_pre_rend_mode( &args ) )
		#else
		if ( args.delayCompensationEnabled )
		#endif
		)
		{
		if ( IVAS_REND_GetDelay( hIvasRend, &delayNumSamples, &delayTimeScale ) != IVAS_ERR_OK )
		{

lib_dec/ivas_output_config.c

+11 −9

Original line number	Diff line number	Diff line
		@@ -89,11 +89,11 @@ void ivas_renderer_select(
		{
		if ( st_ivas->ism_mode == ISM_MODE_PARAM )
		{
		if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		\|\| output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM
		if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL \|\| output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
		#else
		if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL )
		#endif
		)
		{
		*renderer_type = RENDERER_BINAURAL_PARAMETRIC;
		}
		@@ -142,11 +142,12 @@ void ivas_renderer_select(
		else if ( st_ivas->ivas_format == MASA_FORMAT \|\| st_ivas->ivas_format == MASA_ISM_FORMAT \|\| ( ( st_ivas->ivas_format == SBA_FORMAT \|\| st_ivas->ivas_format == SBA_ISM_FORMAT ) && st_ivas->nchan_transport <= 2 ) )
		{
		*internal_config = output_config;
		if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL

		#ifdef SPLIT_REND_WITH_HEAD_ROT
		\|\| output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM
		if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL \|\| output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
		#else
		if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL )
		#endif
		)
		{
		*renderer_type = RENDERER_BINAURAL_PARAMETRIC;
		}
		@@ -158,6 +159,7 @@ void ivas_renderer_select(
		else if ( st_ivas->ivas_format == SBA_FORMAT \|\| st_ivas->ivas_format == SBA_ISM_FORMAT )
		{
		*internal_config = IVAS_AUDIO_CONFIG_HOA3;

		if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL \|\| output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		\|\| output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM
		@@ -206,11 +208,11 @@ void ivas_renderer_select(
		{
		*internal_config = output_config;

		if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		\|\| output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM
		if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL \|\| output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
		#else
		if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL )
		#endif
		)
		{
		*renderer_type = RENDERER_BINAURAL_PARAMETRIC;
		}

lib_dec/ivas_spar_decoder.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -1877,8 +1877,7 @@ void ivas_spar_dec_upmixer_sf(
		}
		else
		{
		if ( ( hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_FOA \|\|
		!( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL \|\| st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR \|\| st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB
		if ( ( hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_FOA \|\| !( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL \|\| st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR \|\| st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		\|\| st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM
		#endif

lib_enc/ivas_ism_metadata_enc.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -204,7 +204,6 @@ ivas_error ivas_ism_metadata_enc(
		ivas_error error;

		error = IVAS_ERR_OK;

		push_wmops( "ism_meta_enc" );

		/* initialization */
		@@ -291,6 +290,7 @@ ivas_error ivas_ism_metadata_enc(
		/----------------------------------------------------------------
		* Rate importance of particular ISM streams
		----------------------------------------------------------------/

		if ( ism_mode != ISM_SBA_MODE_DISC )
		{
		rate_ism_importance( nchan_transport, hIsmMeta, hSCE, lowrate_metadata_flag, ism_imp );
		@@ -974,6 +974,7 @@ static void encode_radius(
		*
		* Encoding of an angle
		----------------------------------------------------------------/

		static void encode_angle_indices(
		BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle */
		ISM_METADATA_ANGLE_HANDLE angle, /* i/o: angle handle */