Merge branch 'main' into 1028-level-drop-in-ismx-formats-at-higher-bitrates (95b22ea9) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+17 −13

Original line number	Diff line number	Diff line
		@@ -379,6 +379,17 @@ branch-is-up-to-date-with-main-pre:
		- echo $commits_behind_count
		- if [ $commits_behind_count -eq 0 ]; then exit 0; else echo "Your branch is behind main, run 'git merge origin/main' to update."; exit 1; fi;

		check-self-test-names-pre:
		extends:
		- .rules-merge-request
		stage: prevalidate
		needs: []
		tags:
		- ivas-linux
		script:
		- python3 ci/check_self_test_names.py scripts/config/self_test.prm 135


		branch-is-up-to-date-with-main-post:
		extends:
		- .rules-merge-request
		@@ -1340,22 +1351,17 @@ ivas-conformance:
		timeout: "60 minutes"
		rules:
		- if: ($CI_PIPELINE_SOURCE == 'web' \|\| $CI_PIPELINE_SOURCE == 'trigger') && $MANUAL_PIPELINE_TYPE == 'ivas-conformance'
		# - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
		allow_failure:
		exit_codes:
		- 123
		script:
		- *print-common-info-windows
		# Prepare reference exec, use tests and scripts from reference
		- $source_branch_commit_sha = $(git rev-parse HEAD)
		- git checkout main # This should be set to a relevant reference
		- git pull # Ensure to get the latest version
		- python .\scripts\strip_split_rendering.py
		- MSBuild.exe -maxcpucount .\Workspace_msvc\Workspace_msvc.sln /property:Configuration=Debug
		- cp -force IVAS_cod.exe IVAS_cod_ref.exe
		- cp -force IVAS_dec.exe IVAS_dec_ref.exe
		- cp -force IVAS_rend.exe IVAS_rend_ref.exe
		- git restore .
		- git checkout $source_branch_commit_sha

		# Reference creation
		- python tests/create_short_testvectors.py
		@@ -1370,12 +1376,16 @@ ivas-conformance:

		# Copy input data and output ref data
		- if (Test-Path testvec) {rm -r -force testvec}
		- if (Test-Path TMP_DEC) {rm -r -force TMP_DEC}
		- if (Test-Path TMP_ENC) {rm -r -force TMP_ENC}
		- if (Test-Path TMP_JBM) {rm -r -force TMP_JBM}
		- if (Test-Path TMP_REND) {rm -r -force TMP_REND}
		- mkdir testvec
		- mkdir testvec/binauralRenderer_interface
		- mkdir testvec/testv
		- mkdir testvec/testv/renderer
		- mkdir testvec/bin
		- cp -r -force -ErrorAction Ignore scripts/testv/* testvec/testv
		- cp -force -ErrorAction Ignore scripts/testv/* testvec/testv
		- cp -r -force -ErrorAction Ignore scripts/ls_layouts testvec
		- cp -r -force -ErrorAction Ignore scripts/switchPaths testvec
		- cp -r -force -ErrorAction Ignore scripts/trajectories testvec
		@@ -1425,16 +1435,10 @@ ivas-conformance-linux:
		- 123
		script:
		- *print-common-info
		# Prepare reference exec, use tests and scripts from reference
		- source_branch_commit_sha=$(git rev-parse HEAD)
		- git checkout main # This should be set to a relevant reference

		- make -j
		- cp IVAS_cod IVAS_cod_ref
		- cp IVAS_dec IVAS_dec_ref
		- cp IVAS_rend IVAS_rend_ref
		- git restore .
		- git checkout $source_branch_commit_sha

		# Reference creation
		- python3 tests/create_short_testvectors.py

apps/decoder.c

+191 −1

Original line number	Diff line number	Diff line
		@@ -90,6 +90,17 @@ static
		* Local structure for storing cmdln arguments
		------------------------------------------------------------------------------------------/

		#ifdef FIX_1053_REVERB_RECONFIGURATION
		typedef struct
		{
		uint16_t *pID;
		uint16_t *pValidity;
		uint16_t count;
		uint16_t selected;
		uint16_t frameCounter;
		} AcousticEnvironmentSequence;
		#endif

		typedef struct
		{
		char *inputBitstreamFilename;
		@@ -141,7 +152,11 @@ typedef struct
		uint16_t tsmScale;
		#endif
		#endif
		#ifdef FIX_1053_REVERB_RECONFIGURATION
		AcousticEnvironmentSequence aeSequence;
		#else
		uint16_t acousticEnvironmentId;
		#endif
		int16_t Opt_dpid_on;
		uint16_t directivityPatternId[IVAS_MAX_NUM_OBJECTS];

		@@ -432,9 +447,14 @@ int main(
		------------------------------------------------------------------------------------------/

		asked_frame_size = arg.renderFramesize;
		#ifdef FIX_1053_REVERB_RECONFIGURATION
		uint16_t aeID = arg.aeSequence.count > 0 ? arg.aeSequence.pID[0] : 65535;
		if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputConfig, arg.tsmEnabled, arg.renderFramesize, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.enableExternalOrientation, arg.orientation_tracking, arg.renderConfigEnabled, arg.Opt_non_diegetic_pan, arg.non_diegetic_pan_gain,
		arg.Opt_dpid_on, aeID, arg.delayCompensationEnabled ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputConfig, arg.tsmEnabled, arg.renderFramesize, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.enableExternalOrientation, arg.orientation_tracking, arg.renderConfigEnabled, arg.Opt_non_diegetic_pan, arg.non_diegetic_pan_gain,
		arg.Opt_dpid_on, arg.acousticEnvironmentId, arg.delayCompensationEnabled ) ) != IVAS_ERR_OK )

		#endif
		{
		fprintf( stderr, "\nConfigure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		@@ -658,7 +678,11 @@ int main(

		if ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		{
		#ifdef FIX_1053_REVERB_RECONFIGURATION
		if ( ( error = RenderConfigReader_getAcousticEnvironment( renderConfigReader, aeID, &renderConfig.roomAcoustics ) ) == IVAS_ERR_OK )
		#else
		if ( ( error = RenderConfigReader_getAcousticEnvironment( renderConfigReader, arg.acousticEnvironmentId, &renderConfig.roomAcoustics ) ) == IVAS_ERR_OK )
		#endif
		{
		if ( RenderConfigReader_checkValues( &renderConfig ) != IVAS_ERR_OK )
		{
		@@ -668,7 +692,11 @@ int main(
		}
		else
		{
		#ifdef FIX_1053_REVERB_RECONFIGURATION
		fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", aeID );
		#else
		fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", arg.acousticEnvironmentId );
		#endif
		goto cleanup;
		}
		renderConfig.roomAcoustics.override = true;
		@@ -875,6 +903,13 @@ cleanup:

		free( pcmBuf );

		#ifdef FIX_1053_REVERB_RECONFIGURATION
		if ( arg.aeSequence.count > 0 )
		{
		free( arg.aeSequence.pID );
		free( arg.aeSequence.pValidity );
		}
		#endif
		#ifdef DEBUG_SBA_AUDIO_DUMP
		IVAS_DEC_GetSbaDebugParams( hIvasDec, &numOutChannels, &numTransportChannels, &pca_ingest_channels );

		@@ -1090,7 +1125,15 @@ static bool parseCmdlIVAS_dec(
		arg->tsmScaleFileName = NULL;
		#endif
		#endif
		#ifdef FIX_1053_REVERB_RECONFIGURATION
		arg->aeSequence.count = 0;
		arg->aeSequence.pID = NULL;
		arg->aeSequence.pValidity = NULL;
		arg->aeSequence.selected = 0;
		arg->aeSequence.frameCounter = 0;
		#else
		arg->acousticEnvironmentId = 65535;
		#endif
		for ( i = 0; i < IVAS_MAX_NUM_OBJECTS; ++i )
		{
		arg->directivityPatternId[i] = 65535;
		@@ -1474,11 +1517,90 @@ static bool parseCmdlIVAS_dec(

		if ( !is_digits_only( argv[i] ) )
		{
		#ifdef FIX_1053_REVERB_RECONFIGURATION
		uint16_t k;
		char *s = argv[i];
		char *token = argv[i];

		for ( k = 0; s[k]; )
		{
		s[k] == ',' ? k++ : *s++;
		}
		k++;

		if ( k == 0 )
		{
		fprintf( stdout, "Error: Invalid acoustic environment sequence specified: %s\n\n", argv[i] );
		usage_dec();
		return false;
		}

		if ( NULL == ( arg->aeSequence.pID = malloc( sizeof( uint16_t ) * k ) ) \|\|
		NULL == ( arg->aeSequence.pValidity = malloc( sizeof( uint16_t ) * k ) ) )
		{
		fprintf( stdout, "Error: Unable to allocate memory for acoustic environment sequence: %s\n\n", argv[i] );
		usage_dec();
		return false;
		}

		arg->aeSequence.count = k;

		k = 0;
		token = strtok( argv[i++], ":" );

		while ( token != NULL )
		{
		if ( !is_number( token ) )
		{
		fprintf( stdout, "Error: Invalid token %s found in acoustic environment sequence: %s\n\n", token, argv[i] );
		usage_dec();
		return false;
		}
		arg->aeSequence.pID[k] = (uint16_t) atoi( token );

		token = strtok( NULL, "," );
		if ( !is_number( token ) )
		{
		fprintf( stdout, "Error: Invalid token %s found in acoustic environment sequence: %s\n\n", token, argv[i] );
		usage_dec();
		return false;
		}
		arg->aeSequence.pValidity[k] = (uint16_t) atoi( token );

		token = strtok( NULL, ":" );
		k++;
		}

		if ( k != arg->aeSequence.count )
		{
		fprintf( stdout, "Error while parsing acoustic environment sequence: %s\n\n", argv[i] );
		usage_dec();
		return false;
		}
		#else
		fprintf( stdout, "Error: Invalid acoustic environment ID specified: %s\n\n", argv[i] );
		usage_dec();
		return false;
		#endif
		}
		#ifdef FIX_1053_REVERB_RECONFIGURATION
		else
		{
		/* A single acoustic environment */
		if ( NULL == ( arg->aeSequence.pID = malloc( sizeof( uint16_t ) ) ) \|\|
		NULL == ( arg->aeSequence.pValidity = malloc( sizeof( uint16_t ) ) ) )
		{
		fprintf( stdout, "Error: Unable to allocate memory for acoustic environment sequence: %s\n\n", argv[i] );
		usage_dec();
		return false;
		}
		arg->aeSequence.count = 1;
		arg->aeSequence.pID[0] = (int16_t) atoi( argv[i++] );
		arg->aeSequence.pValidity[0] = 0;
		}
		#else
		arg->acousticEnvironmentId = (int16_t) atoi( argv[i++] );
		#endif
		}
		else if ( strcmp( argv_to_upper, "-DPID" ) == 0 )
		{
		@@ -1717,7 +1839,15 @@ static void usage_dec( void )
		fprintf( stdout, " output configuration. ID1, ID2, ID3, ID4 specify the directivity pattern IDs used for\n" );
		fprintf( stdout, " ISMs 1,2,3 and 4 respectively. This options needs to be accompanied by a render_config file,\n" );
		fprintf( stdout, " otherwise a default directivity pattern is used.\n" );
		#ifdef FIX_1053_REVERB_RECONFIGURATION
		fprintf( stdout, "-aeid ID : Acoustic environment ID (number > 0) or\n" );
		fprintf( stdout, " a sequence thereof in the format [ID1:duration1,ID2:duration2...]\n" );
		fprintf( stdout, " without braces and spaces, with ':' character separating ID from duration and ',' separating\n" );
		fprintf( stdout, " ID and duration pairs, where duration is specified in frames\n" );
		fprintf( stdout, " for BINAURAL_ROOM_REVERB output configuration.\n" );
		#else
		fprintf( stdout, "-aeid ID : Acoustic environment ID (number >= 0) for BINAURAL_ROOM_REVERB output configuration\n" );
		#endif
		fprintf( stdout, "-level level : Complexity level, level = (1, 2, 3), will be defined after characterisation. \n" );
		fprintf( stdout, " Currently, all values default to level 3 (full functionality).\n" );
		fprintf( stdout, "-q : Quiet mode, no frame counter\n" );
		@@ -2082,6 +2212,31 @@ static ivas_error decodeG192(
		SplitFileReadWrite *splitRendWriter = NULL;
		#endif

		#ifdef FIX_1053_REVERB_RECONFIGURATION
		IVAS_RENDER_CONFIG_DATA renderConfig;
		RenderConfigReader *renderConfigReader = NULL;

		if ( arg.renderConfigEnabled )
		{
		if ( ( error = RenderConfigReader_open( arg.renderConfigFilename, &renderConfigReader ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError: Can't open Renderer configuration file %s \n\n", arg.renderConfigFilename );
		goto cleanup;
		}

		if ( ( error = IVAS_DEC_GetRenderConfig( hIvasDec, &renderConfig ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_GetRenderConfig failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}

		if ( RenderConfigReader_read( renderConfigReader, arg.renderConfigFilename, &renderConfig ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Failed to read renderer configuration from file %s\n\n", arg.renderConfigFilename );
		goto cleanup;
		}
		}
		#endif
		for ( i = 0; i < IVAS_MAX_NUM_OBJECTS; ++i )
		{
		ismWriters[i] = NULL;
		@@ -2291,6 +2446,38 @@ static ivas_error decodeG192(
		{
		if ( needNewFrame )
		{
		#ifdef FIX_1053_REVERB_RECONFIGURATION
		if ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB && renderConfigReader != NULL &&
		arg.aeSequence.count > 0 && arg.aeSequence.pValidity[arg.aeSequence.selected] != 0 )
		{
		if ( ++arg.aeSequence.frameCounter >= arg.aeSequence.pValidity[arg.aeSequence.selected] )
		{
		if ( ++arg.aeSequence.selected >= arg.aeSequence.count )
		{
		arg.aeSequence.selected = 0;
		}
		arg.aeSequence.frameCounter = 0;
		if ( ( error = RenderConfigReader_getAcousticEnvironment( renderConfigReader, arg.aeSequence.pID[arg.aeSequence.selected], &renderConfig.roomAcoustics ) ) == IVAS_ERR_OK )
		{
		if ( RenderConfigReader_checkValues( &renderConfig ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Invalid acoustic environment configuratoin parameters\n\n" );
		goto cleanup;
		}
		}
		else
		{
		fprintf( stderr, "Failed to get acoustic environment with ID %d\n\n", arg.aeSequence.pID[arg.aeSequence.selected] );
		goto cleanup;
		}
		if ( ( error = IVAS_DEC_FeedRenderConfig( hIvasDec, renderConfig ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_FeedRenderConfig failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}
		}
		}
		#endif
		#ifdef DEBUGGING
		#ifdef VARIABLE_SPEED_DECODING
		if ( arg.tsmScaleFileEnabled )
		@@ -2738,6 +2925,9 @@ static ivas_error decodeG192(

		cleanup:

		#ifdef FIX_1053_REVERB_RECONFIGURATION
		RenderConfigReader_close( &renderConfigReader );
		#endif
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		split_rend_reader_writer_close( &splitRendWriter );
		#endif

apps/renderer.c

+181 −4

Original line number	Diff line number	Diff line
		@@ -150,6 +150,17 @@ typedef struct
		IVAS_CUSTOM_LS_DATA outSetupCustom;
		} OutputConfig;

		#ifdef FIX_1053_REVERB_RECONFIGURATION
		typedef struct
		{
		uint16_t *pID;
		uint16_t *pValidity;
		uint16_t count;
		uint16_t selected;
		uint16_t frameCounter;
		} AcousticEnvironmentSequence;
		#endif

		typedef struct
		{
		char executableName[RENDERER_MAX_CLI_ARG_LENGTH];
		@@ -189,7 +200,11 @@ typedef struct
		float syncMdDelay;
		IVAS_RENDER_FRAMESIZE render_framesize;
		uint16_t directivityPatternId[RENDERER_MAX_ISM_INPUTS];
		#ifdef FIX_1053_REVERB_RECONFIGURATION
		AcousticEnvironmentSequence aeSequence;
		#else
		uint16_t acousticEnvironmentId;
		#endif
		} CmdlnArgs;

		typedef enum
		@@ -322,10 +337,12 @@ static const CmdLnParser_Option cliOptions[] = {
		.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)",
		},
		{ .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 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)",
		},
		{
		.id = CmdLnOptionId_noDelayCmp,
		.match = "no_delay_compensation",
		@@ -390,7 +407,11 @@ static const CmdLnParser_Option cliOptions[] = {
		.id = CmdLnOptionId_acousticEnvironmentId,
		.match = "acoustic_environment_id",
		.matchShort = "aeid",
		#ifdef FIX_1053_REVERB_RECONFIGURATION
		.description = "Acoustic environment ID( number > 0 ) or a sequence thereof in the format [ID1:duration1,ID2:duration2...] without braces and spaces, with ':' character separating ID from duration and ',' separating ID and duration pairs, where duration is specified in frames for BINAURAL_ROOM_REVERB output configuration.",
		#else
		.description = "Acoustic environment ID (number >= 0) for BINAURAL_ROOM_REVERB output configuration",
		#endif
		},
		};

		@@ -784,6 +805,9 @@ int main(
		int16_t zeroPadToWrite = 0;
		int32_t delayTimeScale = 0;
		int16_t i, numChannels;
		#ifdef FIX_1053_REVERB_RECONFIGURATION
		uint16_t aeID;
		#endif
		ivas_error error = IVAS_ERR_OK;
		bool splitBinNeedsNewFrame = true;

		@@ -1160,7 +1184,12 @@ int main(

		if ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		{
		#ifdef FIX_1053_REVERB_RECONFIGURATION
		aeID = args.aeSequence.count > 0 ? args.aeSequence.pID[0] : 65535;
		if ( ( error = RenderConfigReader_getAcousticEnvironment( renderConfigReader, aeID, &renderConfig.roomAcoustics ) ) == IVAS_ERR_OK )
		#else
		if ( ( error = RenderConfigReader_getAcousticEnvironment( renderConfigReader, args.acousticEnvironmentId, &renderConfig.roomAcoustics ) ) == IVAS_ERR_OK )
		#endif
		{
		if ( RenderConfigReader_checkValues( &renderConfig ) != IVAS_ERR_OK )
		{
		@@ -1170,7 +1199,11 @@ int main(
		}
		else
		{
		#ifdef FIX_1053_REVERB_RECONFIGURATION
		fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", aeID );
		#else
		fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", args.acousticEnvironmentId );
		#endif
		exit( -1 );
		}
		renderConfig.roomAcoustics.override = 1;
		@@ -1601,6 +1634,40 @@ int main(
		num_in_channels = inBuffer.config.numChannels;
		const bool isCurrentFrameMultipleOf20ms = frame % ( 4 / args.render_framesize ) == 0;

		#ifdef FIX_1053_REVERB_RECONFIGURATION
		if ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB && renderConfigReader != NULL &&
		args.aeSequence.count > 0 && args.aeSequence.pValidity[args.aeSequence.selected] != 0 )
		{
		if ( ++args.aeSequence.frameCounter >= args.aeSequence.pValidity[args.aeSequence.selected] )
		{
		IVAS_RENDER_CONFIG_DATA renderConfig;

		if ( ++args.aeSequence.selected >= args.aeSequence.count )
		{
		args.aeSequence.selected = 0;
		}
		args.aeSequence.frameCounter = 0;
		if ( ( error = RenderConfigReader_getAcousticEnvironment( renderConfigReader, args.aeSequence.pID[args.aeSequence.selected], &renderConfig.roomAcoustics ) ) == IVAS_ERR_OK )
		{
		if ( RenderConfigReader_checkValues( &renderConfig ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Invalid acoustic environment configuratoin parameters\n\n" );
		goto cleanup;
		}
		}
		else
		{
		fprintf( stderr, "Failed to get acoustic environment with ID %d\n\n", args.aeSequence.pID[args.aeSequence.selected] );
		goto cleanup;
		}
		if ( ( error = IVAS_REND_FeedRenderConfig( hIvasRend, renderConfig ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_REND_FeedRenderConfig failed: %s\n\n", ivas_error_to_string( error ) );
		goto cleanup;
		}
		}
		}
		#endif
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		numSamplesRead = 0;
		if ( ( hSplitRendFileReadWrite != NULL ) && is_split_post_rend_mode( &args ) && splitBinNeedsNewFrame )
		@@ -2192,6 +2259,13 @@ cleanup:
		{
		free( bitsBufferData );
		}
		#endif
		#ifdef FIX_1053_REVERB_RECONFIGURATION
		if ( args.aeSequence.count > 0 )
		{
		free( args.aeSequence.pID );
		free( args.aeSequence.pValidity );
		}
		#endif
		for ( i = 0; i < RENDERER_MAX_MASA_INPUTS; ++i )
		{
		@@ -2673,6 +2747,94 @@ static bool parseLfePositionConfig(
		}


		#ifdef FIX_1053_REVERB_RECONFIGURATION
		static bool parseAcousticEnvironmentIds(
		const char *value,
		AcousticEnvironmentSequence *aeSequence )
		{
		uint16_t k;
		char config_string[RENDERER_MAX_METADATA_LINE_LENGTH];
		char *s;
		char *token;

		strncpy( config_string, value, RENDERER_MAX_METADATA_LINE_LENGTH );
		s = config_string;
		token = config_string;

		if ( !is_digits_only( config_string ) )
		{

		for ( k = 0; s[k]; )
		{
		s[k] == ',' ? k++ : *s++;
		}
		k++;

		if ( k == 0 )
		{
		fprintf( stdout, "Error: Invalid acoustic environment sequence specified: %s\n\n", config_string );
		return false;
		}

		if ( NULL == ( aeSequence->pID = malloc( sizeof( uint16_t ) * k ) ) \|\|
		NULL == ( aeSequence->pValidity = malloc( sizeof( uint16_t ) * k ) ) )
		{
		fprintf( stdout, "Error: Unable to allocate memory for acoustic environment sequence: %s\n\n", config_string );
		return false;
		}

		aeSequence->count = k;

		k = 0;

		token = strtok( config_string, ":" );

		while ( token != NULL )
		{
		if ( !is_number( token ) )
		{
		fprintf( stdout, "Error: Invalid token %s found in acoustic environment sequence: %s\n\n", token, config_string );
		return false;
		}
		aeSequence->pID[k] = (uint16_t) atoi( token );

		token = strtok( NULL, "," );
		if ( !is_number( token ) )
		{
		fprintf( stdout, "Error: Invalid token %s found in acoustic environment sequence: %s\n\n", token, config_string );
		return false;
		}
		aeSequence->pValidity[k] = (uint16_t) atoi( token );

		token = strtok( NULL, ":" );
		k++;
		}

		if ( k != aeSequence->count )
		{
		fprintf( stdout, "Error while parsing acoustic environment sequence: %s\n\n", config_string );
		return false;
		}
		}
		else
		{
		/* A single acoustic environment */
		if ( NULL == ( aeSequence->pID = malloc( sizeof( uint16_t ) ) ) \|\|
		NULL == ( aeSequence->pValidity = malloc( sizeof( uint16_t ) ) ) )
		{
		fprintf( stdout, "Error: Unable to allocate memory for acoustic environment sequence: %s\n\n", config_string );
		return false;
		}
		aeSequence->count = 1;
		aeSequence->pID[0] = (int16_t) atoi( config_string );
		aeSequence->pValidity[0] = 0;
		}

		return true;
		}
		#endif


		static bool checkRequiredArgs(
		CmdlnArgs args )
		{
		@@ -2789,7 +2951,15 @@ static CmdlnArgs defaultArgs(
		args.directivityPatternId[i] = 65535;
		}

		#ifdef FIX_1053_REVERB_RECONFIGURATION
		args.aeSequence.count = 0;
		args.aeSequence.pID = NULL;
		args.aeSequence.pValidity = NULL;
		args.aeSequence.selected = 0;
		args.aeSequence.frameCounter = 0;
		#else
		args.acousticEnvironmentId = 65535;
		#endif

		return args;
		}
		@@ -2961,12 +3131,19 @@ static void parseOption(
		break;
		case CmdLnOptionId_acousticEnvironmentId:
		assert( numOptionValues == 1 );
		#ifdef FIX_1053_REVERB_RECONFIGURATION
		if ( !parseAcousticEnvironmentIds( optionValues[0], &args->aeSequence ) )
		{
		fprintf( stderr, "Invalid acoustic environment ID specified: %s\n", optionValues[0] );
		}
		#else
		if ( !is_digits_only( optionValues[0] ) )
		{
		fprintf( stderr, "Invalid acousting environment ID specified: %s\n", optionValues[0] );
		exit( -1 );
		}
		args->acousticEnvironmentId = (int16_t) strtol( optionValues[0], NULL, 10 );
		#endif
		break;
		case CmdLnOptionId_syncMdDelay:
		assert( numOptionValues == 1 );

ci/check_self_test_names.py

0 → 100644

+59 −0

File added.

Preview size limit exceeded, changes collapsed.

lib_com/options.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -156,6 +156,7 @@
		/#define FIX_I4_OL_PITCH/ /* fix open-loop pitch used for EVS core switching */
		/#define SPLIT_REND_WITH_HEAD_ROT / /* Dlb,FhG: Split Rendering contributions 21 and 35 */

		#define FIX_1053_REVERB_RECONFIGURATION /* Philips: issue 1053: fix for dynamic switching of acoustic environment */
		#define FIX_1060_USAN_ARRAY_BOUNDS /* FhG: issue 1060: USAN array-bounds errors */