Merge with float-pc (985e7edc) · Commits · SA4 / Audio / IVAS BASOP

.gitlab-ci.yml

+6 −0

Original line number	Diff line number	Diff line
		@@ -2163,13 +2163,19 @@ ivas-interop-on-merge-request:
		- *update-scripts-repo
		- *update-ltv-repo
		- *complexity-measurements-setup
		# delete previous jobs logfiles if present (-f flag ensures return calue of 0 even in first run where this folder is not present)
		- rm -rf COMPLEXITY/logs
		- which coan
		allow_failure:
		exit_codes:
		- 123
		artifacts:
		name: "$CI_JOB_NAME--$CI_COMMIT_REF_NAME--sha-$CI_COMMIT_SHA"
		when: always
		expire_in: 2 week
		paths:
		- $CI_JOB_NAME-public
		- COMPLEXITY/logs

		complexity-stereo-in-stereo-out:
		extends:

CMakeLists.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@
		# cmake --build . --config Release


		cmake_minimum_required(VERSION 3.1)
		cmake_minimum_required(VERSION 3.10)

		set(CMAKE_C_STANDARD 99)

		@@ -121,7 +121,7 @@ if(WMOPS)
		add_definitions("-DWMOPS=1")
		endif()

		project(stereo-evs)
		project(stereo-evs LANGUAGES C)
		set_property(GLOBAL PROPERTY USE_FOLDERS ON) # make Visual Studio projects look nicer
		include(CTest)

apps/decoder.c

+20 −0

Original line number	Diff line number	Diff line
		@@ -1508,7 +1508,27 @@ static bool parseCmdlIVAS_dec(
		* Mandatory input arguments
		-----------------------------------------------------------------/

		#ifdef FIX_956_DECODER_COMMAND_LINE_FIX
		if ( i < argc - 4 )
		{
		for ( i = 1; i < argc; i++ )
		{
		if ( argv[i][0] == '-' )
		{
		fprintf( stderr, "Error: Wrong order of command-line arguments (optional arguments are first)\n\n" );
		usage_dec();
		return false;
		}
		}

		fprintf( stderr, "Error: Too many mandatory command-line arguments\n\n" );
		usage_dec();
		return false;
		}
		else if ( i < argc - 3 )
		#else
		if ( i < argc - 3 )
		#endif
		{
		arg->outputConfig = cmdline2config( argv[i] );
		if ( arg->outputConfig == IVAS_AUDIO_CONFIG_LS_CUSTOM )

apps/encoder.c

+2 −28

Original line number	Diff line number	Diff line
		@@ -384,13 +384,11 @@ int main(
		goto cleanup;
		}

		#ifdef SUPPORT_FORCE_TCX10_TCX20
		#ifdef DEBUGGING
		if ( arg.forcedMode == IVAS_ENC_FORCE_TCX10 && totalBitrate < 48000 )
		{
		fprintf( stderr, "Warning: Enforcing the TCX10 mode is only supported for bitrates higher or equal than 48 kbps!\n\n" );
		}
		#endif
		#endif

		/------------------------------------------------------------------------------------------
		@@ -1111,7 +1109,6 @@ static bool parseCmdlIVAS_enc(
		}
		else
		{
		#ifdef SUPPORT_FORCE_TCX10_TCX20
		if ( arg->forcedMode == IVAS_ENC_FORCE_TCX10 )
		{
		strcpy( stmp, "TCX10" );
		@@ -1126,9 +1123,6 @@ static bool parseCmdlIVAS_enc(
		}

		fprintf( stdout, "Forcing codec to: %s\n", stmp );
		#else
		fprintf( stdout, "Forcing codec to: %s\n", argv[i + 1] );
		#endif
		}
		#endif

		@@ -2114,24 +2108,14 @@ static IVAS_ENC_FORCED_MODE parseForcedMode(
		{
		return IVAS_ENC_FORCE_GSC;
		}
		if ( ( strcmp( forcedModeChar, "TCX" ) == 0 ) \|\| ( strcmp( forcedModeChar, "'TCX'" ) == 0 )
		#ifdef SUPPORT_FORCE_TCX10_TCX20
		\|\| ( strcmp( forcedModeChar, "TCX20" ) == 0 ) \|\| ( strcmp( forcedModeChar, "'TCX20'" ) == 0 )
		#endif
		)
		if ( ( strcmp( forcedModeChar, "TCX" ) == 0 ) \|\| ( strcmp( forcedModeChar, "'TCX'" ) == 0 ) \|\| ( strcmp( forcedModeChar, "TCX20" ) == 0 ) \|\| ( strcmp( forcedModeChar, "'TCX20'" ) == 0 ) )
		{
		#ifdef SUPPORT_FORCE_TCX10_TCX20
		return IVAS_ENC_FORCE_TCX20;
		#else
		return IVAS_ENC_FORCE_TCX;
		#endif
		}
		#ifdef SUPPORT_FORCE_TCX10_TCX20
		if ( ( strcmp( forcedModeChar, "TCX10" ) == 0 ) \|\| ( strcmp( forcedModeChar, "'TCX10'" ) == 0 ) )
		{
		return IVAS_ENC_FORCE_TCX10;
		}
		#endif
		else if ( ( strcmp( forcedModeChar, "HQ" ) == 0 ) \|\| ( strcmp( forcedModeChar, "'HQ'" ) == 0 ) )
		{
		return IVAS_ENC_FORCE_HQ;
		@@ -2174,24 +2158,14 @@ static IVAS_ENC_FORCED_MODE parseForcedMode(
		{
		return IVAS_ENC_FORCE_GSC;
		}
		if ( ( strcmp( forcedModeChar, "TCX" ) == 0 ) \|\| ( strcmp( forcedModeChar, "'TCX'" ) == 0 )
		#ifdef SUPPORT_FORCE_TCX10_TCX20
		\|\| ( strcmp( forcedModeChar, "TCX20" ) == 0 ) \|\| ( strcmp( forcedModeChar, "'TCX20'" ) == 0 )
		#endif
		)
		if ( ( strcmp( forcedModeChar, "TCX" ) == 0 ) \|\| ( strcmp( forcedModeChar, "'TCX'" ) == 0 ) \|\| ( strcmp( forcedModeChar, "TCX20" ) == 0 ) \|\| ( strcmp( forcedModeChar, "'TCX20'" ) == 0 ) )
		{
		#ifdef SUPPORT_FORCE_TCX10_TCX20
		return IVAS_ENC_FORCE_TCX20;
		#else
		return IVAS_ENC_FORCE_TCX;
		#endif
		}
		#ifdef SUPPORT_FORCE_TCX10_TCX20
		if ( ( strcmp( forcedModeChar, "TCX10" ) == 0 ) \|\| ( strcmp( forcedModeChar, "'TCX10'" ) == 0 ) )
		{
		return IVAS_ENC_FORCE_TCX10;
		}
		#endif
		if ( ( strcmp( forcedModeChar, "HQ" ) == 0 ) \|\| ( strcmp( forcedModeChar, "'HQ'" ) == 0 ) )
		{
		return IVAS_ENC_FORCE_HQ;

apps/renderer.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -320,11 +320,7 @@ static const CmdLnParser_Option cliOptions[] = {
		.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,
		#ifdef FIX_929_RENDERER_CMDL
		.match = "no_delay_compensation",
		#else
		.match = "no_delay_comparison",
		#endif
		.matchShort = "no_delay_cmp",
		.description = "[flag] Turn off delay compensation",
		},