Merge branch 'float-pc' of https://forge.3gpp.org/rep/sa4/audio/ivas-basop into float-pc (c7ce8ad9) · Commits · SA4 / Audio / IVAS BASOP

.gitlab-ci.yml

+6 −3

Original line number	Diff line number	Diff line
		@@ -12,13 +12,15 @@ variables:
		LONG_TEST_SUITE_NO_RENDERER: "tests/codec_be_on_mr_nonselection --param_file scripts/config/self_test_ltv.prm --use_ltv"
		SHORT_TEST_SUITE: "tests/codec_be_on_mr_nonselection"
		TEST_SUITE: ""
		DISABLE_HRTF_MODEL_TESTS: ""
		# DISABLE_HRTF_MODEL_TESTS: "-k not model" #enable this declaration to disable HRTF model from file tests
		DUT_ENCODER_PATH: "./IVAS_cod"
		DUT_DECODER_PATH: "./IVAS_dec"
		REF_ENCODER_PATH: "./IVAS_cod_ref"
		REF_DECODER_PATH: "./IVAS_dec_ref"
		LEVEL_SCALING: "1.0"
		IVAS_PIPELINE_NAME: ''
		BASOP_CI_BRANCH_PC_REPO: "basop-ci-branch"
		BASOP_CI_BRANCH_PC_REPO: "basop-ci-branch-pc"
		PRM_FILES: "scripts/config/self_test.prm scripts/config/self_test_ltv.prm"
		TESTCASE_TIMEOUT_STV: 900
		TESTCASE_TIMEOUT_LTV: 2400
		@@ -241,6 +243,7 @@ stages:
		- git checkout "$BASOP_CI_BRANCH_PC_REPO"
		- git reset --hard origin/"$BASOP_CI_BRANCH_PC_REPO"
		- git pull

		- cd -
		- cp -r $SCRIPTS_DIR/ci .
		- cp -r $SCRIPTS_DIR/scripts .
		@@ -2031,7 +2034,7 @@ ivas-pytest-on-merge-request:

		### prepare pytest
		# create references
		- python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --update_ref 1
		- python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --update_ref 1 $DISABLE_HRTF_MODEL_TESTS

		### Run test using branch scripts and input
		- if [ $ref_using_target == 1 ]; then git checkout $source_branch_commit_sha; fi
		@@ -2039,7 +2042,7 @@ ivas-pytest-on-merge-request:
		### run pytest
		- exit_code=0
		- testcase_timeout=60
		- python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --html=report.html --self-contained-html --junit-xml=report-junit.xml --testcase_timeout=$testcase_timeout \|\| exit_code=$?
		- python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --html=report.html --self-contained-html --junit-xml=report-junit.xml --testcase_timeout=$testcase_timeout $DISABLE_HRTF_MODEL_TESTS \|\| exit_code=$?
		- zero_errors=$(cat report-junit.xml \| grep -c 'errors="0"') \|\| true

		- *merge-request-comparison-check

apps/decoder.c

+6 −55

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

		if ( ( error = load_HRTF_binary( *hHrtfTD, hrtfReader ) ) != IVAS_ERR_OK )
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		#ifdef FIX_OLD_BINARY_FORMAT
		hrtfFileReader_close( &hrtfReader );
		strcat( arg.hrtfFileName, "new" );

		if ( hrtfFileReader_open( arg.hrtfFileName, &hrtfReader ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
		goto cleanup;
		}

		if ( ( error = load_HRTF_binary( *hHrtfTD, hrtfReader ) ) != IVAS_ERR_OK )
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		@@ -724,19 +710,8 @@ int main(
		destroy_td_hrtf( hHrtfTD );
		}
		}
		#else
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
		goto cleanup;
		#endif
		}
		else
		{
		destroy_td_hrtf( hHrtfTD );
		}
		}

		#ifndef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
		#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
		if ( ( hHrtfTD != NULL ) && ( error = load_reverb_binary( hHrtfTD, hrtfReader ) ) != IVAS_ERR_OK )
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		@@ -745,7 +720,6 @@ int main(
		goto cleanup;
		}
		}
		#endif
		#endif

		if ( ( error = IVAS_DEC_GetHrtfCRendHandle( hIvasDec, &hSetOfHRTF ) ) != IVAS_ERR_OK )
		@@ -756,18 +730,6 @@ int main(

		if ( ( error = create_SetOfHRTF_from_binary( *hSetOfHRTF, hrtfReader, arg.output_Fs ) ) != IVAS_ERR_OK )
		{
		#ifdef FIX_OLD_BINARY_FORMAT
		cleanup_SetOfHRTF( hSetOfHRTF );
		hrtfFileReader_close( &hrtfReader );
		strcat( arg.hrtfFileName, "new" );

		if ( hrtfFileReader_open( arg.hrtfFileName, &hrtfReader ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
		goto cleanup;
		}
		if ( ( error = create_SetOfHRTF_from_binary( *hSetOfHRTF, hrtfReader, arg.output_Fs ) ) != IVAS_ERR_OK )
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
		@@ -778,18 +740,6 @@ int main(
		destroy_SetOfHRTF( hSetOfHRTF );
		}
		}
		#else
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
		goto cleanup;
		}
		else
		{
		destroy_SetOfHRTF( hSetOfHRTF );
		}
		#endif
		}

		IVAS_DEC_HRTF_FASTCONV_HANDLE *hHrtfFastConv = NULL;
		if ( ( error = IVAS_DEC_GetHrtfFastConvHandle( hIvasDec, &hHrtfFastConv ) ) != IVAS_ERR_OK )
		@@ -833,7 +783,6 @@ int main(


		#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
		#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
		if ( ( error = IVAS_DEC_GetHrtfStatisticsHandle( hIvasDec, &hHrtfStatistics ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_GetHrtfHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		@@ -852,12 +801,14 @@ int main(
		}
		}
		#else
		if ( ( hHrtfTD != NULL ) && ( error = load_reverb_binary( hHrtfTD, hrtfReader ) ) != IVAS_ERR_OK )
		if ( ( hHrtfTD != NULL ) && ( hHrtfTD != NULL ) && ( error = load_reverb_binary( hHrtfTD, hrtfReader ) ) != IVAS_ERR_OK )
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
		goto cleanup;
		}
		#endif
		}
		#endif
		}

apps/renderer.c

+99 −97

Original line number	Diff line number	Diff line
		@@ -148,7 +148,7 @@ typedef struct
		int32_t sampleRate;
		InputConfig inConfig;
		OutputConfig outConfig;
		char inMetadataFilePaths[RENDERER_MAX_ISM_INPUTS][RENDERER_MAX_CLI_ARG_LENGTH];
		char inMetadataFilePaths[RENDERER_MAX_ISM_INPUTS + RENDERER_MAX_MASA_INPUTS][RENDERER_MAX_CLI_ARG_LENGTH];
		int16_t numInMetadataFiles;
		char outMetadataFilePath[RENDERER_MAX_CLI_ARG_LENGTH];
		char headRotationFilePath[RENDERER_MAX_CLI_ARG_LENGTH];
		@@ -220,13 +220,13 @@ static const CmdLnParser_Option cliOptions[] = {
		.id = CmdLnOptionId_inputFormat,
		.match = "input_format",
		.matchShort = "if",
		.description = "Audio format of input file (e.g. 5_1 or HOA3 or META, use -l for a list)",
		.description = "Audio format of input file (e.g. 5_1 or HOA3 or META,\nuse -l for a list)",
		},
		{
		.id = CmdLnOptionId_inputMetadata,
		.match = "input_metadata",
		.matchShort = "im",
		.description = "Space-separated list of path to metadata files for ISM or MASA inputs or BINAURAL_SPLIT_PCM input mode",
		.description = "Space-separated list of path to metadata files for ISM/MASA/OMASA/\nOSBA/BINAURAL_SPLIT_PCM inputs. \nFor OMASA, ISM files must be specified first.",
		},
		{
		.id = CmdLnOptionId_outputFile,
		@@ -244,13 +244,13 @@ static const CmdLnParser_Option cliOptions[] = {
		.id = CmdLnOptionId_sampleRate,
		.match = "sample_rate",
		.matchShort = "fs",
		.description = "Input sampling rate in kHz (16, 32, 48) - required only with raw PCM inputs",
		.description = "Input sampling rate in kHz (16, 32, 48) - required only with raw\nPCM inputs",
		},
		{
		.id = CmdLnOptionId_trajFile,
		.match = "trajectory_file",
		.matchShort = "T",
		.description = "Head rotation trajectory file for simulation of head tracking (only for binaural outputs)",
		.description = "Head rotation trajectory file for simulation of head tracking\n(only for binaural outputs)",
		},
		{
		.id = CmdLnOptionId_outputMetadata,
		@@ -268,42 +268,44 @@ static const CmdLnParser_Option cliOptions[] = {
		.id = CmdLnOptionId_refRotFile,
		.match = "reference_rotation_file",
		.matchShort = "rf",
		.description = "Reference rotation trajectory file for simulation of head tracking (only for binaural outputs)",
		.description = "Reference rotation trajectory file for simulation of head tracking\n(only for binaural outputs)",
		},
		{
		.id = CmdLnOptionId_customHrtfFile,
		.match = "custom_hrtf",
		.matchShort = "hrtf",
		.description = "Custom HRTF file for binaural rendering (only for binaural outputs)",
		.description = "Custom HRTF file for binaural rendering\n(only for binaural outputs)",
		},
		{
		.id = CmdLnOptionId_renderConfigFile,
		.match = "render_config_parameters",
		.matchShort = "render_config",
		.description = "Binaural renderer configuration parameters in file (only for binaural outputs)",
		.description = "Binaural renderer configuration parameters in file\n(only for binaural outputs)",
		},
		{
		.id = CmdLnOptionId_nonDiegeticPan,
		.match = "non_diegetic_panning",
		.matchShort = "non_diegetic_pan",
		.description = "Panning mono non diegetic sound to stereo -90<= pan <= 90\nleft or l or 90->left, right or r or -90->right, center or c or 0 ->middle\n",
		.description = "Panning mono non diegetic sound to stereo -90<= pan <= 90\nleft or l or 90->left, right or r or -90->right,\ncenter or c or 0 ->middle",
		},
		{
		.id = CmdLnOptionId_orientationTracking,
		.match = "tracking_type",
		.matchShort = "otr",
		.description = "Head orientation tracking type: 'none', 'ref', 'avg' or `ref_vec` or `ref_vec_lev` (only for binaural outputs)",
		.description = "Head orientation tracking type: 'none', 'ref', 'avg' or `ref_vec`\nor `ref_vec_lev` (only for binaural outputs)",
		},
		{
		.id = CmdlnOptionId_lfePosition,
		.match = "lfe_position",
		.matchShort = "lp",
		.description = "Output LFE position. Comma-delimited triplet of [gain, azimuth, elevation] where gain is linear (like --gain, -g) and azimuth, elevation are in degrees.\nIf specified, overrides the default behavior which attempts to map input to output LFE channel(s)",
		.description = "Output LFE position. Comma-delimited triplet of [gain, azimuth,\nelevation] where gain is linear (like --gain, -g) and azimuth,\nelevation are in degrees. If specified, overrides the default\nbehavior which attempts to map input to output LFE channel(s)",
		},
		{ .id = CmdlnOptionId_lfeMatrix,
		{
		.id = CmdlnOptionId_lfeMatrix,
		.match = "lfe_matrix",
		.matchShort = "lm",
		.description = "LFE panning matrix. File (CSV table) containing a matrix of dimensions [ num_input_lfe x num_output_channels ] with elements specifying linear routing gain (like --gain, -g). \nIf specified, overrides the output LFE position option and the default behavior which attempts to map input to output LFE channel(s)" },
		.description = "LFE panning matrix. File (CSV table) containing a matrix of\ndimensions [ num_input_lfe x num_output_channels ] with elements\nspecifying linear routing gain (like --gain, -g). If specified,\noverrides the output LFE position option and the default\nbehavior which attempts to map input to output LFE channel(s)",
		},
		{
		.id = CmdLnOptionId_noDelayCmp,
		.match = "no_delay_compensation",
		@@ -314,7 +316,7 @@ static const CmdLnParser_Option cliOptions[] = {
		.id = CmdLnOptionId_complexityLevel,
		.match = "complexity_level",
		.matchShort = "level",
		.description = "Complexity level, level = (1, 2, 3), will be defined after characterisation.",
		.description = "Complexity level, level = (1, 2, 3), will be defined after\ncharacterisation.",
		},
		{
		.id = CmdLnOptionId_quietModeEnabled,
		@@ -338,13 +340,13 @@ static const CmdLnParser_Option cliOptions[] = {
		.id = CmdLnOptionId_referenceVectorFile,
		.match = "reference_vector_file",
		.matchShort = "rvf",
		.description = "Reference vector trajectory file for simulation of head tracking (only for binaural outputs)",
		.description = "Reference vector trajectory file for simulation of head tracking\n(only for binaural outputs)",
		},
		{
		.id = CmdLnOptionId_exteriorOrientationFile,
		.match = "exterior_orientation_file",
		.matchShort = "exof",
		.description = "External orientation trajectory file for simulation of external orientations",
		.description = "External orientation trajectory file for simulation of external\norientations",
		},
		{
		.id = CmdLnOptionId_framing,
		@@ -356,19 +358,19 @@ static const CmdLnParser_Option cliOptions[] = {
		.id = CmdLnOptionId_syncMdDelay,
		.match = "sync_md_delay",
		.matchShort = "smd",
		.description = "Metadata Synchronization Delay in ms, Default is 0. Quantized by 5ms subframes for TDRenderer (13ms -> 10ms -> 2subframes)",
		.description = "Metadata Synchronization Delay in ms, Default is 0. Quantized by\n5ms subframes for TDRenderer (13ms -> 10ms -> 2subframes)",
		},
		{
		.id = CmdLnOptionId_directivityPatternId,
		.match = "ism_directivity_pattern_id",
		.matchShort = "dpid",
		.description = "Directivity pattern ID(s) = [ID1, ID2, ID3, ID4]. Space-separated list of up to 4 numbers (unsigned integers) can be specified for BINAURAL and BINAURAL_ROOM_REVERB output configuration.\nID1, ID2, ID3, ID4 specify the directivity pattern IDs used for ISMs 1,2,3 and 4 respectively.\nThis options needs to be accompanied by a render_config file, otherwise a default directivity pattern is used.",
		.description = "Directivity pattern ID(s) = [ID1, ID2, ID3, ID4]. Space-separated\nlist of up to 4 numbers (unsigned integers) can be specified for\nBINAURAL and BINAURAL_ROOM_REVERB output.\nID1, ID2, ID3, ID4 specify the directivity pattern IDs used for\nISMs 1,2,3 and 4 respectively. \nThis option needs to be accompanied by a render_config file,\notherwise a default directivity pattern is used.",
		},
		{
		.id = CmdLnOptionId_acousticEnvironmentId,
		.match = "acoustic_environment_id",
		.matchShort = "aeid",
		.description = "Acoustic environment ID (number >= 0) for BINAURAL_ROOM_REVERB output configuration",
		.description = "Acoustic environment ID (number >= 0) for BINAURAL_ROOM_REVERB output.",
		},
		};

		@@ -383,6 +385,8 @@ static IVAS_AUDIO_CONFIG ambisonicsOrderToEnum( const int16_t order );

		static void parseSceneDescriptionFile( char path, char audioFilePath, InputConfig inConfig, IsmPositionProvider positionProvider, MasaFileReader masaReaders, LfeRoutingConfig lfeRoutingConfigs );

		static void parseCombinedFormatInput( InputConfig inConfig, char *configString );

		static ivas_error parseCustomLayoutFile( const char filePath, IVAS_CUSTOM_LS_DATA pLsSetupCustom );

		static CmdlnArgs parseCmdlnArgs( const int argc, char **argv );
		@@ -541,25 +545,7 @@ static void setupWithSingleFormatInput(
		strncpy( audioFilePath, args.inputFilePath, FILENAME_MAX - 1 );

		/* Depending on input format, prepare metadata reading for ISM or MASA */
		if ( args.inConfig.numMasaBuses != 0 )
		{
		if ( args.inConfig.numMasaBuses != args.numInMetadataFiles )
		{
		fprintf( stderr, "Error: all MASA inputs must have a corresponding metadata file" );
		exit( -1 );
		}

		for ( int16_t i = 0; i < args.numInMetadataFiles; ++i )
		{
		masaReaders[i] = MasaFileReader_open( args.inMetadataFilePaths[i] );
		if ( masaReaders[i] == NULL )
		{
		fprintf( stderr, "Could not open MASA metadata file %s\n", args.inMetadataFilePaths[i] );
		exit( -1 );
		}
		}
		}
		else if ( args.inConfig.numAudioObjects != 0 )
		if ( args.inConfig.numAudioObjects != 0 )
		{
		positionProvider->numObjects = args.inConfig.numAudioObjects;
		for ( int16_t i = 0; i < positionProvider->numObjects; ++i )
		@@ -582,6 +568,26 @@ static void setupWithSingleFormatInput(
		}
		}
		}
		if ( args.inConfig.numMasaBuses != 0 )
		{
		if ( args.inConfig.numMasaBuses != ( args.numInMetadataFiles - args.inConfig.numAudioObjects ) )
		{
		fprintf( stderr, "Error: all MASA inputs must have a corresponding metadata file" );
		exit( -1 );
		}

		int16_t reader_idx = 0;
		for ( int16_t i = args.inConfig.numAudioObjects; i < args.numInMetadataFiles; ++i )
		{
		reader_idx = i - args.inConfig.numAudioObjects;
		masaReaders[reader_idx] = MasaFileReader_open( args.inMetadataFilePaths[i] );
		if ( masaReaders[reader_idx] == NULL )
		{
		fprintf( stderr, "Could not open MASA metadata file %s\n", args.inMetadataFilePaths[i] );
		exit( -1 );
		}
		}
		}

		return;
		}
		@@ -932,18 +938,6 @@ int main(
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		#ifdef FIX_OLD_BINARY_FORMAT
		hrtfFileReader_close( &hrtfFileReader );
		strcat( args.customHrtfFilePath, "new" );
		if ( hrtfFileReader_open( args.customHrtfFilePath, &hrtfFileReader ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s: %s \n\n", args.customHrtfFilePath, ivas_error_to_string( error ) );
		goto cleanup;
		}
		if ( ( error = load_HRTF_binary( *hHrtfTD, hrtfFileReader ) ) != IVAS_ERR_OK )
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s: %s \n\n", args.customHrtfFilePath, ivas_error_to_string( error ) );
		goto cleanup;
		}
		@@ -952,19 +946,8 @@ int main(
		destroy_td_hrtf( hHrtfTD );
		}
		}
		#else
		fprintf( stderr, "\nError in loading HRTF binary file %s: %s \n\n", args.customHrtfFilePath, ivas_error_to_string( error ) );
		goto cleanup;
		#endif
		}
		else
		{
		destroy_td_hrtf( hHrtfTD );
		}
		}

		#ifndef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
		#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
		if ( ( hHrtfTD != NULL ) && ( error = load_reverb_binary( *hHrtfTD, hrtfFileReader ) ) != IVAS_ERR_OK )
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		@@ -973,7 +956,6 @@ int main(
		goto cleanup;
		}
		}
		#endif
		#endif

		if ( ( error = IVAS_REND_GetHrtfCRendHandle( hIvasRend, &hSetOfHRTF ) ) != IVAS_ERR_OK )
		@@ -984,17 +966,6 @@ int main(

		if ( ( error = create_SetOfHRTF_from_binary( *hSetOfHRTF, hrtfFileReader, args.sampleRate ) ) != IVAS_ERR_OK )
		{
		#ifdef FIX_OLD_BINARY_FORMAT
		cleanup_SetOfHRTF( hSetOfHRTF );
		hrtfFileReader_close( &hrtfFileReader );
		strcat( args.customHrtfFilePath, "new" );
		if ( hrtfFileReader_open( args.customHrtfFilePath, &hrtfFileReader ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s: %s \n\n", args.customHrtfFilePath, ivas_error_to_string( error ) );
		goto cleanup;
		}
		if ( ( error = create_SetOfHRTF_from_binary( *hSetOfHRTF, hrtfFileReader, args.sampleRate ) ) != IVAS_ERR_OK )
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s:%s \n\n", args.customHrtfFilePath, ivas_error_to_string( error ) );
		@@ -1005,18 +976,6 @@ int main(
		destroy_SetOfHRTF( hSetOfHRTF );
		}
		}
		#else
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s:%s \n\n", args.customHrtfFilePath, ivas_error_to_string( error ) );
		goto cleanup;
		}
		else
		{
		destroy_SetOfHRTF( hSetOfHRTF );
		}
		#endif
		}

		if ( ( error = IVAS_REND_GetHrtfFastConvHandle( hIvasRend, &hHrtfFastConv ) ) != IVAS_ERR_OK )
		{
		@@ -1057,7 +1016,6 @@ int main(
		}

		#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
		#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
		if ( ( error = IVAS_REND_GetHrtfStatisticsHandle( hIvasRend, &hHrtfStatistics ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_REND_GetHrtfStatisticsHandle failed\n\n" );
		@@ -1075,7 +1033,6 @@ int main(
		destroy_hrtf_statistics( hHrtfStatistics );
		}
		}
		#endif
		#endif
		}

		@@ -2163,16 +2120,11 @@ static bool parseInConfig(
		inConfig->masaBuses[0].gain_dB = 0.0f;
		break;
		case IVAS_AUDIO_CONFIG_OBA:
		/* If input format is objects, parse the characters after "ISM" to get number of objects */
		/* If input format is objects, parse the characters after "ISM" to get
		* number of objects and check for combined formats. */
		{
		char *ptr = NULL;
		inConfig->numAudioObjects = (uint16_t) strtol( inFormatStr + 3, &ptr, 10 );
		if ( ptr == NULL \|\| *ptr != '\0' )
		{
		/* Failed to parse string as a number */
		fprintf( stderr, "Cannot parse string \"%s\" as a valid input format", inFormatStr );
		return false;
		}
		if ( inConfig->numAudioObjects > RENDERER_MAX_ISM_INPUTS )
		{
		fprintf( stderr, "Too many objects at input. Max %d supported.", RENDERER_MAX_ISM_INPUTS );
		@@ -2184,6 +2136,17 @@ static bool parseInConfig(
		inConfig->audioObjects[i].inputChannelIndex = i;
		inConfig->audioObjects[i].gain_dB = 0.0f;
		}
		if ( *ptr != '\0' )
		{
		/* Try to parse combined format */
		parseCombinedFormatInput( inConfig, &ptr );
		}
		if ( ptr == NULL \|\| *ptr != '\0' )
		{
		/* Failed to parse string as a number */
		fprintf( stderr, "Cannot parse string \"%s\" as a valid input format", inFormatStr );
		return false;
		}
		}
		break;
		case IVAS_AUDIO_CONFIG_INVALID:
		@@ -2624,7 +2587,7 @@ static void parseOption(
		}
		break;
		case CmdLnOptionId_inputMetadata:
		assert( numOptionValues <= RENDERER_MAX_ISM_INPUTS );
		assert( numOptionValues <= RENDERER_MAX_ISM_INPUTS + RENDERER_MAX_MASA_INPUTS );
		for ( int16_t i = 0; i < numOptionValues; ++i )
		{
		strncpy( args->inMetadataFilePaths[i], optionValues[i], RENDERER_MAX_CLI_ARG_LENGTH - 1 );
		@@ -3447,6 +3410,41 @@ static void parseMasa(
		return;
		}

		static void parseCombinedFormatInput(
		InputConfig *inConfig,
		char **configString )
		{
		IVAS_AUDIO_CONFIG audioConfig;
		audioConfig = parseAudioConfig( *configString );

		if ( audioConfig == IVAS_AUDIO_CONFIG_FOA \|\| audioConfig == IVAS_AUDIO_CONFIG_HOA2 \|\| audioConfig == IVAS_AUDIO_CONFIG_HOA3 )
		{
		/* OSBA */
		inConfig->numAmbisonicsBuses = 1;
		inConfig->ambisonicsBuses[0].audioConfig = audioConfig;
		inConfig->ambisonicsBuses[0].inputChannelIndex = inConfig->numAudioObjects;
		inConfig->ambisonicsBuses[0].gain_dB = -6.f;
		*configString += 4;

		/* Modify input gain for objects too */
		for ( int16_t i = 0; i < inConfig->numAudioObjects; ++i )
		{
		inConfig->audioObjects[i].gain_dB = -6.f;
		}
		}
		else if ( audioConfig == IVAS_AUDIO_CONFIG_MASA1 \|\| audioConfig == IVAS_AUDIO_CONFIG_MASA2 )
		{
		/* OMASA */
		inConfig->numMasaBuses = 1;
		inConfig->masaBuses[0].audioConfig = audioConfig;
		inConfig->masaBuses[0].inputChannelIndex = inConfig->numAudioObjects;
		inConfig->masaBuses[0].gain_dB = 0.0f;
		*configString += 5;
		}

		return;
		}

		static ivas_error parseCustomLayoutFile(
		const char *filePath,
		IVAS_CUSTOM_LS_DATA *pLsSetupCustom )
		@@ -3663,12 +3661,15 @@ static void printSupportedAudioConfigs( void )
		"HOA2",
		"HOA3",
		"ISMx (input only)",
		"ISMxSBAy (OSBA, input only)",
		"ISMxMASAy (OMASA, input only)",
		"MASAx",
		"BINAURAL (output only)",
		"BINAURAL_SPLIT_PCM",
		"BINAURAL_SPLIT_CODED",
		"BINAURAL_ROOM_IR (output only)",
		"BINAURAL_ROOM_REVERB (output only)",
		"META (Scene description, input only)",
		};

		fprintf( stdout, "Supported audio formats:\n" );
		@@ -3676,6 +3677,7 @@ static void printSupportedAudioConfigs( void )
		{
		fprintf( stdout, "%s\n", supportedFormats[i] );
		}
		fprintf( stdout, "\n" );

		return;
		}

enum-helper.c

deleted100644 → 0

+0 −382

File deleted.

Preview size limit exceeded, changes collapsed.

lib_com/options.h

+3 −16

File changed.

Preview size limit exceeded, changes collapsed.