formatting (a4767011) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+10 −15

Original line number	Diff line number	Diff line
		@@ -307,9 +307,7 @@ int main(
		if ( arg.enableHeadRotation )
		{
		/* sanity check */
		if ( arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB
		&& arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM
		)
		if ( arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
		{
		fprintf( stderr, "\nError: Head-rotation file file cannot be used in this output configuration.\n\n" );
		goto cleanup;
		@@ -409,10 +407,8 @@ int main(
		if ( arg.renderConfigEnabled )
		{
		/* sanity check */
		if ( arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB
		&& arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM &&
		arg.Opt_non_diegetic_pan == 0
		)
		if ( arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM &&
		arg.Opt_non_diegetic_pan == 0 )
		{
		fprintf( stderr, "\nError: Renderer configuration file cannot be used in this output configuration.\n\n" );
		goto cleanup;
		@@ -1798,8 +1794,7 @@ static ivas_error initOnFirstGoodFrame(
		IsmFileWriter ismWriters[IVAS_MAX_NUM_OBJECTS], / o : */
		int16_t pNumOutChannels, / o : */
		uint16_t pNumObj, / o : */
		SplitFileReadWrite **splitRendWriter
		)
		SplitFileReadWrite **splitRendWriter )
		{
		int16_t isSplitRend, isSplitCoded;
		ivas_error error = IVAS_ERR_UNKNOWN;

apps/isar_post_rend.c

+7 −15

Original line number	Diff line number	Diff line
		@@ -772,12 +772,10 @@ int main(
		args.inMetadataFilePaths[0],
		&bitsBuffer.config.codec,
		&bitsBuffer.config.poseCorrection,
		&bitsBuffer.config.codec_frame_size_ms
		,
		&bitsBuffer.config.codec_frame_size_ms,
		&bitsBuffer.config.isar_frame_size_ms,
		&inFileSampleRate,
		&bitsBuffer.config.lc3plusHighRes
		);
		&bitsBuffer.config.lc3plusHighRes );
		if ( error != IVAS_ERR_OK )
		{
		fprintf( stderr, "Could not open split rend metadata file %s\n", args.inMetadataFilePaths[0] );
		@@ -798,12 +796,10 @@ int main(
		args.inputFilePath,
		&bitsBuffer.config.codec,
		&bitsBuffer.config.poseCorrection,
		&bitsBuffer.config.codec_frame_size_ms
		,
		&bitsBuffer.config.codec_frame_size_ms,
		&bitsBuffer.config.isar_frame_size_ms,
		&inFileSampleRate,
		&bitsBuffer.config.lc3plusHighRes
		);
		&bitsBuffer.config.lc3plusHighRes );
		if ( error != IVAS_ERR_OK )
		{
		fprintf( stderr, "Could not open split rend metadata file %s\n", args.inputFilePath );
		@@ -816,8 +812,7 @@ int main(
		{
		error = AudioFileReader_getSamplingRate( audioReader, &inFileSampleRate );
		}
		else
		if ( hSplitRendFileReadWrite == NULL )
		else if ( hSplitRendFileReadWrite == NULL )
		{
		inFileSampleRate = args.sampleRate;
		}
		@@ -887,11 +882,9 @@ int main(
		if ( ( error = ISAR_REND_SetSplitRendBitstreamHeader( hIsarPostRend,
		bitsBuffer.config.codec,
		bitsBuffer.config.poseCorrection,
		bitsBuffer.config.codec_frame_size_ms
		,
		bitsBuffer.config.codec_frame_size_ms,
		bitsBuffer.config.isar_frame_size_ms,
		bitsBuffer.config.lc3plusHighRes
		) ) != IVAS_ERR_OK )
		bitsBuffer.config.lc3plusHighRes ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error in getting split renderer bitstream header: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		@@ -1257,4 +1250,3 @@ int main(


		#undef WMC_TOOL_SKIP

apps/renderer.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -3708,8 +3708,7 @@ static void convertInputBuffer(
		const int16_t numChannels,
		float *floatBuffer,
		const int16_t cldfb_in_flag,
		IVAS_CLDFB_FILTER_BANK_HANDLE *cldfbAna
		)
		IVAS_CLDFB_FILTER_BANK_HANDLE *cldfbAna )
		{
		int16_t chnl, smpl, i;

		@@ -3789,8 +3788,7 @@ static void convertOutputBuffer(
		const int16_t numChannels,
		int16_t *intBuffer,
		const int16_t cldfb_in_flag,
		IVAS_CLDFB_FILTER_BANK_HANDLE *cldfbSyn
		)
		IVAS_CLDFB_FILTER_BANK_HANDLE *cldfbSyn )
		{
		int16_t chnl, smpl, i;
		float temp;

lib_dec/ivas_binRenderer_internal.c

+5 −6

Original line number	Diff line number	Diff line
		@@ -140,8 +140,7 @@ static ivas_error ivas_binRenderer_convModuleOpen(
		const int16_t isLoudspeaker,
		const AUDIO_CONFIG input_config,
		const HRTFS_FASTCONV_HANDLE hHrtf,
		const int16_t num_poses
		)
		const int16_t num_poses )
		{
		int16_t bandIdx, chIdx;
		BINRENDERER_CONV_MODULE_HANDLE hBinRenConvModule;

lib_dec/ivas_init_dec.c

+5 −9

Original line number	Diff line number	Diff line
		@@ -875,10 +875,8 @@ ivas_error ivas_init_decoder_front(
		* Allocate and initialize Binaural Renderer configuration handle
		--------------------------------------------------------------------/

		if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL \|\| st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR \|\| st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB
		\|\| st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM \|\|
		( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_STEREO && st_ivas->hDecoderConfig->Opt_non_diegetic_pan )
		)
		if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL \|\| st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR \|\| st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB \|\| st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM \|\|
		( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_STEREO && st_ivas->hDecoderConfig->Opt_non_diegetic_pan ) )
		{
		if ( ( error = ivas_render_config_open( &( st_ivas->hRenderConfig ) ) ) != IVAS_ERR_OK )
		{
		@@ -2874,9 +2872,7 @@ static ivas_error doSanityChecks_IVAS(

		if ( st_ivas->hDecoderConfig->Opt_Headrotation )
		{
		if ( !( output_config == IVAS_AUDIO_CONFIG_BINAURAL \|\| output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR \|\| output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB
		\|\| 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_ROOM_IR \|\| output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB \|\| output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )
		{
		return IVAS_ERROR( IVAS_ERR_HEAD_ROTATION_NOT_SUPPORTED, "Wrong set-up: Head-rotation not supported in this configuration" );
		}