[cleanup] accept FIX_351_HRTF_COMMAND (61e88113) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -219,7 +219,6 @@ int main(

		if ( arg.hrtfReaderEnabled )
		{
		#ifdef FIX_351_HRTF_COMMAND
		/* sanity check */
		if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM )
		{
		@@ -227,13 +226,10 @@ int main(
		fprintf( stderr, "\nError: HRTF binary file cannot be used in this output configuration.\n\n" );
		goto cleanup;
		}
		#endif

		if ( ( error = hrtfFileReader_open( arg.hrtfFileName, &hrtfReader ) ) != IVAS_ERR_OK )
		{
		#ifdef FIX_351_HRTF_COMMAND
		arg.hrtfReaderEnabled = false;
		#endif
		fprintf( stderr, "\nError: Can't open HRTF binary file %s \n\n", arg.hrtfFileName );
		goto cleanup;
		}
		@@ -245,14 +241,12 @@ int main(

		if ( arg.enableHeadRotation )
		{
		#ifdef FIX_351_HRTF_COMMAND
		/* sanity check */
		if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM )
		{
		fprintf( stderr, "\nError: Head-rotation file file cannot be used in this output configuration.\n\n" );
		goto cleanup;
		}
		#endif

		if ( ( error = HeadRotationFileReader_open( arg.headrotTrajFileName, &headRotReader ) ) != IVAS_ERR_OK )
		{
		@@ -280,14 +274,12 @@ int main(

		if ( arg.renderConfigEnabled )
		{
		#ifdef FIX_351_HRTF_COMMAND
		/* sanity check */
		if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM )
		{
		fprintf( stderr, "\nError: Renderer configuration file cannot be used in this output configuration.\n\n" );
		goto cleanup;
		}
		#endif

		if ( ( error = RenderConfigReader_open( arg.renderConfigFilename, &renderConfigReader ) ) != IVAS_ERR_OK )
		{

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -147,7 +147,6 @@
		/#define SBA_HPF_TUNING_DEC/

		#define BINAURALIZATION_DELAY_REPORT /* VA: Issue 255 - Changes the way the decoder delay is reported */
		#define FIX_351_HRTF_COMMAND /* VA: Issue 354 - improve "-hrtf" command-line option */
		#define FIX_94_VERIFY_WAV_NUM_CHANNELS /* FhG: Issue 94 - Check if number of channels in input wav file matches encoder/renderer configuration */
		#define ISM_HIGHEST_BITRATE /* VA: Issue 284: Update highest bitrate limit in ISM format */
		#define TUNE_360_OBJECT_WITH_NOISE /* VA: issue 360: consider objects being speech+noise for active speech coding */

lib_dec/ivas_stat_dec.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -1143,9 +1143,7 @@ typedef struct decoder_config_structure
		int16_t Opt_LsCustom; /* indicates whether loudspeaker custom setup is used */
		int16_t Opt_HRTF_binary; /* indicates whether HRTF binary file is used */
		int16_t Opt_Headrotation; /* indicates whether head-rotation is used */
		#ifdef FIX_351_HRTF_COMMAND
		int16_t Opt_RendConfigCustom; /* indicates whether Renderer configuration custom setup is used */
		#endif
		int16_t orientation_tracking; /* indicates orientation tracking type */
		float no_diegetic_pan;
		int16_t Opt_AMR_WB; /* flag indicating AMR-WB IO mode */

lib_dec/lib_dec.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -223,9 +223,7 @@ static void init_decoder_config(
		hDecoderConfig->Opt_LsCustom = 0;
		hDecoderConfig->Opt_HRTF_binary = 0;
		hDecoderConfig->Opt_Headrotation = 0;
		#ifdef FIX_351_HRTF_COMMAND
		hDecoderConfig->Opt_RendConfigCustom = 0;
		#endif
		hDecoderConfig->orientation_tracking = orientation_tracking;
		hDecoderConfig->no_diegetic_pan = no_diegetic_pan;

		@@ -390,10 +388,8 @@ ivas_error IVAS_DEC_Configure(
		const int16_t customLsOutputEnabled, /* i : enable custom loudspeaker setup handle */
		const int16_t hrtfReaderEnabled, /* i : enable HRTF binary file input */
		const int16_t enableHeadRotation /* i : enable head rotation for binaural output */
		#ifdef FIX_351_HRTF_COMMAND
		,
		const int16_t renderConfigEnabled /* i : enable Renderer config. file for binaural output */
		#endif
		)
		{
		Decoder_Struct *st_ivas;
		@@ -442,9 +438,7 @@ ivas_error IVAS_DEC_Configure(
		hDecoderConfig->Opt_LsCustom = customLsOutputEnabled;
		hDecoderConfig->Opt_Headrotation = enableHeadRotation;
		hDecoderConfig->Opt_HRTF_binary = hrtfReaderEnabled;
		#ifdef FIX_351_HRTF_COMMAND
		hDecoderConfig->Opt_RendConfigCustom = renderConfigEnabled;
		#endif

		/* Set decoder parameters to initial values */
		if ( ( error = ivas_init_decoder_front( st_ivas ) ) != IVAS_ERR_OK )
		@@ -1924,7 +1918,6 @@ static ivas_error printConfigInfo_dec(
		get_channel_config( st_ivas->hDecoderConfig->output_config, &config_str[0] );
		fprintf( stdout, "Output configuration: %s\n", config_str );

		#ifdef FIX_351_HRTF_COMMAND
		if ( st_ivas->hDecoderConfig->Opt_HRTF_binary )
		{
		fprintf( stdout, "HRIR/BRIR file: ON\n" );
		@@ -1934,7 +1927,6 @@ static ivas_error printConfigInfo_dec(
		{
		fprintf( stdout, "Renderer config. file: ON\n" );
		}
		#endif

		if ( st_ivas->hDecoderConfig->Opt_Headrotation )
		{

lib_dec/lib_dec.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -130,9 +130,7 @@ ivas_error IVAS_DEC_Configure(
		const int16_t customLsOutputEnabled, /* i : enable custom loudspeaker setup handle */
		const int16_t hrtfReaderEnabled, /* i : enable HRTF binary file input */
		const int16_t enableHeadRotation /* i : enable head rotation for binaural output */
		#ifdef FIX_351_HRTF_COMMAND
		,const int16_t renderConfigEnabled /* i : enable Renderer config. file for binaural output */
		#endif

		);