Updates reflecting the discussion on issue #196 (19304914) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+15 −20

Original line number	Diff line number	Diff line
		@@ -263,8 +263,7 @@ int main(
		{
		/* sanity check */
		#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG
		if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM &&
		arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_HRIR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_BRIR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_HRIR_REVERB )
		if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM_IR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM_REVERB )
		#else
		if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM )
		#endif
		@@ -290,8 +289,7 @@ int main(
		{
		/* sanity check */
		#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG
		if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM &&
		arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_HRIR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_BRIR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_HRIR_REVERB )
		if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM_IR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM_REVERB )
		#else
		if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM )
		#endif
		@@ -315,8 +313,7 @@ int main(
		{
		/* sanity check */
		#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG
		if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM &&
		arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_HRIR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_BRIR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_HRIR_REVERB )
		if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM_IR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM_REVERB )
		#else
		if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM )
		#endif
		@@ -347,8 +344,7 @@ int main(
		{
		/* sanity check */
		#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG
		if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM &&
		arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_HRIR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_BRIR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_HRIR_REVERB )
		if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM_IR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM_REVERB )
		#else
		if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM )
		#endif
		@@ -392,8 +388,7 @@ int main(
		{
		/* sanity check */
		#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG
		if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM &&
		arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_HRIR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_BRIR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_HRIR_REVERB )
		if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM_IR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM_REVERB )
		#else
		if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM )
		#endif
		@@ -575,8 +570,7 @@ int main(

		/* sanity check */
		#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG
		if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM &&
		arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_HRIR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_BRIR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_HRIR_REVERB )
		if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM_IR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM_REVERB )
		#else
		if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL )
		#endif
		@@ -872,19 +866,19 @@ static IVAS_DEC_AUDIO_CONFIG cmdline2config(
		output_config = IVAS_DEC_OUTPUT_HOA3;
		}
		#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG
		else if ( strcmp( argv_to_upper, "BINAURAL_HRIR" ) == 0 )
		else if ( strcmp( argv_to_upper, "BINAURAL" ) == 0 )
		{
		output_config = IVAS_DEC_OUTPUT_BINAURAL_HRIR;
		output_config = IVAS_DEC_OUTPUT_BINAURAL;
		}
		else if ( strcmp( argv_to_upper, "BINAURAL_BRIR" ) == 0 )
		else if ( strcmp( argv_to_upper, "BINAURAL_ROOM_IR" ) == 0 )
		{
		output_config = IVAS_DEC_OUTPUT_BINAURAL_BRIR;
		output_config = IVAS_DEC_OUTPUT_BINAURAL_ROOM_IR;
		}
		else if ( strcmp( argv_to_upper, "BINAURAL_HRIR_REVERB" ) == 0 )
		else if ( strcmp( argv_to_upper, "BINAURAL_ROOM_REVERB" ) == 0 )
		{
		output_config = IVAS_DEC_OUTPUT_BINAURAL_HRIR_REVERB;
		output_config = IVAS_DEC_OUTPUT_BINAURAL_ROOM_REVERB;
		}
		#endif
		#else
		else if ( strcmp( argv_to_upper, "BINAURAL" ) == 0 )
		{
		output_config = IVAS_DEC_OUTPUT_BINAURAL;
		@@ -893,6 +887,7 @@ static IVAS_DEC_AUDIO_CONFIG cmdline2config(
		{
		output_config = IVAS_DEC_OUTPUT_BINAURAL_ROOM;
		}
		#endif
		else
		{
		output_config = IVAS_DEC_OUTPUT_LS_CUSTOM;
		@@ -1426,7 +1421,7 @@ static void usage_dec( void )
		fprintf( stdout, "---------------------\n" );
		fprintf( stdout, "OutputConf : Output configuration: MONO, STEREO, 5_1, 7_1, 5_1_2, 5_1_4, 7_1_4, FOA,\n" );
		#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG
		fprintf( stdout, " HOA2, HOA3, BINAURAL_HRIR, BINAURAL_BRIR, BINAURAL_HRIR_REVERB, EXT\n" );
		fprintf( stdout, " HOA2, HOA3, BINAURAL, BINAURAL_ROOM_IR, BINAURAL_ROOM_REVERB, EXT\n" );
		#else
		fprintf( stdout, " HOA2, HOA3, BINAURAL, BINAURAL_ROOM, EXT\n" );
		#endif

apps/renderer.c

+15 −15

Original line number	Diff line number	Diff line
		@@ -726,8 +726,7 @@ int main(

		/* sanity check */
		#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG
		if ( ( args.outConfig.audioConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM ) && ( args.outConfig.audioConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL ) &&
		( args.outConfig.audioConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL_HRIR ) && ( args.outConfig.audioConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL_BRIR ) && ( args.outConfig.audioConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL_HRIR_REVERB ) )
		if ( ( args.outConfig.audioConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL ) && ( args.outConfig.audioConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM_IR ) && ( args.outConfig.audioConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )
		#else
		if ( ( args.outConfig.audioConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM ) && ( args.outConfig.audioConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL ) )
		#endif
		@@ -753,7 +752,7 @@ int main(
		}

		#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG
		if ( args.outConfig.audioConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_HRIR_REVERB )
		if ( args.outConfig.audioConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		{
		renderConfig.room_acoustics.late_reverb_on = TRUE;
		renderConfig.room_acoustics.override = TRUE;
		@@ -1572,19 +1571,19 @@ static IVAS_REND_AudioConfig parseAudioConfig(
		}
		}
		#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG
		if ( strcmp( charBuf, "BINAURAL_HRIR" ) == 0 )
		if ( strcmp( charBuf, "BINAURAL" ) == 0 )
		{
		return IVAS_REND_AUDIO_CONFIG_BINAURAL_HRIR;
		return IVAS_REND_AUDIO_CONFIG_BINAURAL;
		}
		if ( strcmp( charBuf, "BINAURAL_BRIR" ) == 0 )
		if ( strcmp( charBuf, "BINAURAL_ROOM_IR" ) == 0 )
		{
		return IVAS_REND_AUDIO_CONFIG_BINAURAL_BRIR;
		return IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM_IR;
		}
		if ( strcmp( charBuf, "BINAURAL_HRIR_REVERB" ) == 0 )
		if ( strcmp( charBuf, "BINAURAL_ROOM_REVERB" ) == 0 )
		{
		return IVAS_REND_AUDIO_CONFIG_BINAURAL_HRIR_REVERB;
		return IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM_REVERB;
		}
		#endif
		#else
		if ( strcmp( charBuf, "BINAURAL_ROOM" ) == 0 )
		{
		return IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM;
		@@ -1593,7 +1592,7 @@ static IVAS_REND_AudioConfig parseAudioConfig(
		{
		return IVAS_REND_AUDIO_CONFIG_BINAURAL;
		}

		#endif
		return IVAS_REND_AUDIO_CONFIG_UNKNOWN;
		}

		@@ -2626,12 +2625,13 @@ static void printSupportedAudioConfigs()
		"ISMx (input only)",
		"MASAx (input only)",
		#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG
		"BINAURAL_HRIR (output only)",
		"BINAURAL_BRIR (output only)",
		"BINAURAL_HRIR_REVERB (output only)",
		#endif
		"BINAURAL (output only)",
		"BINAURAL_ROOM_IR (output only)",
		"BINAURAL_ROOM_REVERB (output only)",
		#else
		"BINAURAL (output only)",
		"BINAURAL_ROOM (output only)",
		#endif
		};

		fprintf( stdout, "Supported audio formats:\n" );

lib_com/ivas_cnst.h

+5 −4

Original line number	Diff line number	Diff line
		@@ -101,12 +101,13 @@ typedef enum
		AUDIO_CONFIG_HOA3, /* ambisonics, order 3 */
		AUDIO_CONFIG_OBA, /* object based audio */
		#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG
		AUDIO_CONFIG_BINAURAL_HRIR, /* binaural with HRIR */
		AUDIO_CONFIG_BINAURAL_BRIR, /* binaural with BRIR */
		AUDIO_CONFIG_BINAURAL_HRIR_REVERB, /* binaural with HRIR + reverb */
		#endif
		AUDIO_CONFIG_BINAURAL, /* binaural with HRIR */
		AUDIO_CONFIG_BINAURAL_ROOM_IR, /* binaural with BRIR */
		AUDIO_CONFIG_BINAURAL_ROOM_REVERB, /* binaural with HRIR + reverb */
		#else
		AUDIO_CONFIG_BINAURAL, /* binaural with HRIR */
		AUDIO_CONFIG_BINAURAL_ROOM, /* binaural with HRIR and BRIR */
		#endif
		AUDIO_CONFIG_ISM1, /* ISM1 */
		AUDIO_CONFIG_ISM2, /* ISM2 */
		AUDIO_CONFIG_ISM3, /* ISM3 */

lib_dec/ivas_dec.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -283,7 +283,7 @@ ivas_error ivas_dec(
		if ( ( error = ivas_rend_crendProcess( st_ivas->hCrendWrapper,
		AUDIO_CONFIG_7_1_4,
		#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG
		AUDIO_CONFIG_BINAURAL_BRIR,
		AUDIO_CONFIG_BINAURAL_ROOM_IR,
		#else
		AUDIO_CONFIG_BINAURAL_ROOM,
		#endif

lib_dec/ivas_init_dec.c

+5 −7

Original line number	Diff line number	Diff line
		@@ -664,8 +664,7 @@ ivas_error ivas_init_decoder_front(
		--------------------------------------------------------------------/

		#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG
		if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL \|\| st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_ROOM \|\|
		st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_HRIR \|\| st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_BRIR \|\| st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_HRIR_REVERB )
		if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL \|\| st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_ROOM_IR \|\| st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		#else
		if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL \|\| st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_ROOM )
		#endif
		@@ -677,8 +676,8 @@ ivas_error ivas_init_decoder_front(

		#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG
		if ( ( error = ivas_render_config_init_from_rom( &st_ivas->hRenderConfig,
		st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_ROOM \|\| st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_BRIR \|\| st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_HRIR_REVERB,
		st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_ROOM \|\| st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_BRIR \|\| st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_HRIR_REVERB ) ) != IVAS_ERR_OK )
		st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_ROOM_IR,
		st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = ivas_render_config_init_from_rom( &st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_ROOM ) ) != IVAS_ERR_OK )
		#endif
		@@ -2248,8 +2247,7 @@ static ivas_error doSanityChecks_IVAS(
		if ( st_ivas->hDecoderConfig->Opt_Headrotation )
		{
		#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG
		if ( !( output_config == AUDIO_CONFIG_BINAURAL \|\| output_config == AUDIO_CONFIG_BINAURAL_ROOM \|\|
		output_config == AUDIO_CONFIG_BINAURAL_HRIR \|\| output_config == AUDIO_CONFIG_BINAURAL_BRIR \|\| output_config == AUDIO_CONFIG_BINAURAL_HRIR_REVERB ) )
		if ( !( output_config == AUDIO_CONFIG_BINAURAL \|\| output_config == AUDIO_CONFIG_BINAURAL_ROOM_IR \|\| output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )
		#else
		if ( !( output_config == AUDIO_CONFIG_BINAURAL \|\| output_config == AUDIO_CONFIG_BINAURAL_ROOM ) )
		#endif
		@@ -2260,7 +2258,7 @@ static ivas_error doSanityChecks_IVAS(

		#ifdef DEBUGGING
		#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG
		if ( ( st_ivas->hDecoderConfig->force_rend == FORCE_TD_RENDERER ) && ( ( st_ivas->ivas_format != MC_FORMAT && st_ivas->ivas_format != ISM_FORMAT ) \|\| ( output_config != AUDIO_CONFIG_BINAURAL && output_config != AUDIO_CONFIG_BINAURAL_HRIR ) \|\| ( st_ivas->ivas_format == ISM_FORMAT && st_ivas->ism_mode == ISM_MODE_PARAM ) \|\| ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode != MC_MODE_MCT ) ) )
		if ( ( st_ivas->hDecoderConfig->force_rend == FORCE_TD_RENDERER ) && ( ( st_ivas->ivas_format != MC_FORMAT && st_ivas->ivas_format != ISM_FORMAT ) \|\| ( output_config != AUDIO_CONFIG_BINAURAL && output_config != AUDIO_CONFIG_BINAURAL ) \|\| ( st_ivas->ivas_format == ISM_FORMAT && st_ivas->ism_mode == ISM_MODE_PARAM ) \|\| ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode != MC_MODE_MCT ) ) )
		#else
		if ( ( st_ivas->hDecoderConfig->force_rend == FORCE_TD_RENDERER ) && ( ( st_ivas->ivas_format != MC_FORMAT && st_ivas->ivas_format != ISM_FORMAT ) \|\| output_config != AUDIO_CONFIG_BINAURAL \|\| ( st_ivas->ivas_format == ISM_FORMAT && st_ivas->ism_mode == ISM_MODE_PARAM ) \|\| ( st_ivas->ivas_format == MC_FORMAT && ( st_ivas->mc_mode != MC_MODE_MCT && st_ivas->mc_mode != MC_MODE_PARAMUPMIX ) ) ) )
		#endif