Corrected renderer.c command line parsing, added missing #ifdef guards (86ec9dec) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -283,7 +283,11 @@ int main(
		if ( arg.enableReferenceRotation )
		{
		/* sanity check */
		#ifdef COMMAND_LINE_OPTION_LATE_REVERB
		if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_REVERB )
		#else
		if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM )
		#endif
		{
		fprintf( stderr, "\nError: Reference rotation file cannot be used in this output configuration.\n\n" );
		goto cleanup;
		@@ -310,7 +314,11 @@ int main(
		if ( arg.enableReferenceVectorTracking )
		{
		/* sanity check */
		#ifdef COMMAND_LINE_OPTION_LATE_REVERB
		if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_REVERB )
		#else
		if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM )
		#endif
		{
		fprintf( stderr, "\nError: Reference vector trajectory file cannot be used in this output configuration.\n\n" );
		goto cleanup;

apps/renderer.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -1467,8 +1467,13 @@ static bool parseOrientationTracking(
		static IVAS_REND_AudioConfig parseAudioConfig(
		const char *configString )
		{
		#ifdef COMMAND_LINE_OPTION_LATE_REVERB
		char charBuf[16];
		charBuf[15] = '\0';
		#else
		char charBuf[14];
		charBuf[13] = '\0';
		#endif

		strncpy( charBuf, configString, sizeof( charBuf ) - 1 );
		charBuf[sizeof( charBuf ) - 1] = '\0';

scripts/config/self_test.prm

+8 −8

Original line number	Diff line number	Diff line
		@@ -907,35 +907,35 @@
		../IVAS_cod -mc 5_1 256000 48 testv/stv51MC48c.wav bit
		../IVAS_dec testv/ls_setup_16ch_8+4+4.txt 48 bit testv/stv51MC48c.wav_MC51_256000_48-48_MC_custom_setup.tst

		// Multi-channel 5_1 at 512 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM out Config renderer
		// Multi-channel 5_1 at 512 kbps, 48kHz in, 48kHz out, BINAURAL_REVERB out Config renderer
		../IVAS_cod -mc 5_1 512000 48 testv/stv51MC48c.wav bit
		../IVAS_dec -render_config testv/rend_config_renderer.dat BINAURAL_REVERB 48 bit testv/stv51MC48c.wav_MC51_512000_48-48_MC_Config_renderer.tst

		// Multi-channel 5_1 at 512 kbps, 48kHz in, 32kHz out, BINAURAL_ROOM out Config renderer
		// Multi-channel 5_1 at 512 kbps, 48kHz in, 32kHz out, BINAURAL_REVERB out Config renderer
		../IVAS_cod -mc 5_1 512000 48 testv/stv51MC48c.wav bit
		../IVAS_dec -render_config testv/rend_config_renderer.dat BINAURAL_REVERB 32 bit testv/stv51MC48c.wav_MC51_512000_48-32_MC_Config_renderer.tst

		// Multi-channel 5_1 at 512 kbps, 48kHz in, 16kHz out, BINAURAL_ROOM out Config renderer
		// Multi-channel 5_1 at 512 kbps, 48kHz in, 16kHz out, BINAURAL_REVERB out Config renderer
		../IVAS_cod -mc 5_1 512000 48 testv/stv51MC48c.wav bit
		../IVAS_dec -render_config testv/rend_config_renderer.dat BINAURAL_REVERB 16 bit testv/stv51MC48c.wav_MC51_512000_48-16_MC_Config_renderer.tst

		// Multi-channel 5_1 at 512 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM out Config hospital_patientroom
		// Multi-channel 5_1 at 512 kbps, 48kHz in, 48kHz out, BINAURAL_REVERB out Config hospital_patientroom
		../IVAS_cod -mc 5_1 512000 48 testv/stv51MC48c.wav bit
		../IVAS_dec -render_config testv/rend_config_hospital_patientroom.dat BINAURAL_REVERB 48 bit testv/stv51MC48c.wav_MC51_512000_48-48_MC_Config_hospital_patientroom.tst

		// Multi-channel 5_1 at 512 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM out Config recreation
		// Multi-channel 5_1 at 512 kbps, 48kHz in, 48kHz out, BINAURAL_REVERB out Config recreation
		../IVAS_cod -mc 5_1 512000 48 testv/stv51MC48c.wav bit
		../IVAS_dec -render_config testv/rend_config_recreation.dat BINAURAL_REVERB 48 bit testv/stv51MC48c.wav_MC51_512000_48-48_MC_Config_recreation.tst

		// Multi-channel 5_1_2 at 512 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM out Config renderer
		// Multi-channel 5_1_2 at 512 kbps, 48kHz in, 48kHz out, BINAURAL_REVERB out Config renderer
		../IVAS_cod -mc 5_1_2 512000 48 testv/stv512MC48c.wav bit
		../IVAS_dec -render_config testv/rend_config_renderer.dat BINAURAL_REVERB 48 bit testv/stv512MC48c.wav_MC512_512000_48-48_MC_Config_renderer.tst

		// Multi-channel 5_1_4 at 512 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM out Config renderer
		// Multi-channel 5_1_4 at 512 kbps, 48kHz in, 48kHz out, BINAURAL_REVERB out Config renderer
		../IVAS_cod -mc 5_1_4 512000 48 testv/stv514MC48c.wav bit
		../IVAS_dec -render_config testv/rend_config_renderer.dat BINAURAL_REVERB 48 bit testv/stv514MC48c.wav_MC514_512000_48-48_MC_Config_renderer.tst

		// Multi-channel 7_1_4 at 512 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM out Config renderer
		// Multi-channel 7_1_4 at 512 kbps, 48kHz in, 48kHz out, BINAURAL_REVERB out Config renderer
		../IVAS_cod -mc 7_1_4 512000 48 testv/stv714MC48c.wav bit
		../IVAS_dec -render_config testv/rend_config_renderer.dat BINAURAL_REVERB 48 bit testv/stv714MC48c.wav_MC714_512000_48-48_MC_Config_renderer.tst

lib_com/options.h

+1 −1

File changed.

Contains only whitespace changes.