Merge remote-tracking branch 'remotes/origin/main' into... (0b5776ac) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+16 −9

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@ variables:
		SANITIZER_TESTS: "CLANG1 CLANG2"
		OUT_FORMATS_CHANNEL_BASED: "stereo mono 5_1 5_1_2 5_1_4 7_1 7_1_4"
		OUT_FORMATS_SCENE_BASED: "FOA HOA2 HOA3"
		OUT_FORMATS_BINAURAL: "BINAURAL BINAURAL_ROOM"
		OUT_FORMATS_BINAURAL: "BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB"
		EXIT_CODE_NON_BE: 123
		EXIT_CODE_FAIL: 1

		@@ -69,7 +69,9 @@ stages:
		# compare to last target branch commit before pipeline was created
		- target_commit=$(git log $CI_MERGE_REQUEST_TARGET_BRANCH_NAME -1 --oneline --before=${CI_PIPELINE_CREATED_AT} --format=%H)


		.check-for-testvectors: &check-for-testvectors
		# check if the testvector files specified in scripts/config/ci_linux*.json are present
		- python3 -m pytest ci/test_vectors_available.py

		.merge-request-comparison-setup-codec:
		&merge-request-comparison-setup-codec ### build test binaries, initial clean for paranoia reasons
		@@ -280,7 +282,7 @@ build-codec-sanitizers-linux:
		- *print-common-info
		- bash ci/build_codec_sanitizers_linux.sh

		build-codec-windows-cmake:
		.build-codec-windows-cmake:
		extends:
		- .build-job-windows-with-check-for-warnings
		- .rules-basis
		@@ -293,7 +295,7 @@ build-codec-windows-cmake:
		- ("& python ci/check_for_warnings.py '$BUILD_OUTPUT'") \| Invoke-Expression
		- ("exit $LASTEXITCODE") \| Invoke-Expression

		build-codec-windows-msbuild:
		.build-codec-windows-msbuild:
		extends:
		- .build-job-windows-with-check-for-warnings
		- .rules-basis
		@@ -660,30 +662,35 @@ clang-format-check:
		expose_as: 'formatting patch'

		# check for crashes if first received frame on decoder side is an SID
		.check-first-frame-is-sid:
		check-first-frame-is-sid:
		extends:
		- .test-job-linux-needs-testv-dir
		- .rules-merge-request
		tags:
		- ivas-linux
		stage: test
		needs: ["build-codec-linux-cmake"]
		# needs: ["build-codec-linux-cmake"]
		script:
		- *print-common-info
		- *update-ltv-repo
		- *check-for-testvectors
		- cmake .
		- make -j

		# TODO: for some MASA modes, we currently do not have testvectors that actually trigger DTX
		- modes=$(scripts/runIvasCodec.py -l \| grep dtx \| grep -v MASA)
		- echo $modes
		- scripts/runIvasCodec.py -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 500
		# SBA is run separately to use shorter part of file
		- modes=$(scripts/runIvasCodec.py -l \| grep dtx \| grep -v MASA \| grep -v SBA)
		- scripts/runIvasCodec.py -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 500 -U 0:20 \|\| exit_code_no_sba=$?
		- modes=$(scripts/runIvasCodec.py -l \| grep dtx \| grep SBA)
		- scripts/runIvasCodec.py -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 500 -U 70:80 \|\| exit_code_sba=$?
		- if [ $exit_code_no_sba != 0 \|\| $exit_code_sba != 0]; then exit 1; fi
		artifacts:
		paths:
		- out/logs
		when: on_failure
		name: "$CI_JOB_NAME--$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--sidstart"
		expose_as: "logs-sidstart"
		expire_in: "5 days"

		# ---------------------------------------------------------------
		# Test jobs for main branch

apps/decoder.c

+20 −155

File changed.

Preview size limit exceeded, changes collapsed.

apps/encoder.c

+6 −29

Original line number	Diff line number	Diff line
		@@ -98,9 +98,7 @@ typedef struct
		char *outputBitstreamFilename;
		int32_t inputFs;
		IVAS_ENC_INPUT_FORMAT inputFormat;
		#ifdef BINAURAL_AUDIO_CMDLINE
		bool is_binaural;
		#endif
		EncInputFormatConfig inputFormatConfig;
		bool max_bwidth_user;
		IVAS_ENC_BANDWIDTH maxBandwidth;
		@@ -365,29 +363,17 @@ int main(
		switch ( arg.inputFormat )
		{
		case IVAS_ENC_INPUT_MONO:
		#ifdef BINAURAL_AUDIO_CMDLINE
		if ( ( error = IVAS_ENC_ConfigureForMono( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig, caConfig, arg.inputFormatConfig.stereoToMonoDownmix, arg.is_binaural ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_ENC_ConfigureForMono( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig, caConfig, arg.inputFormatConfig.stereoToMonoDownmix ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "\nIVAS_ENC_ConfigureForMono failed: %s\n\n", IVAS_ENC_GetErrorMessage( error ) );
		goto cleanup;
		}
		break;
		case IVAS_ENC_INPUT_STEREO:
		#ifdef BINAURAL_AUDIO_CMDLINE
		#ifdef DEBUGGING
		if ( ( error = IVAS_ENC_ConfigureForStereo( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig, arg.is_binaural, arg.inputFormatConfig.stereoMode ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_ENC_ConfigureForStereo( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig, arg.is_binaural ) ) != IVAS_ERR_OK )
		#endif
		#else
		#ifdef DEBUGGING
		if ( ( error = IVAS_ENC_ConfigureForStereo( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig, arg.inputFormatConfig.stereoMode ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_ENC_ConfigureForStereo( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig ) ) != IVAS_ERR_OK )
		#endif
		#endif
		{
		fprintf( stderr, "\nIVAS_ENC_ConfigureForStereo failed: %s\n\n", IVAS_ENC_GetErrorMessage( error ) );
		@@ -880,9 +866,7 @@ static void initArgStruct( EncArguments *arg )
		arg->outputBitstreamFilename = NULL;
		arg->inputFs = 0;
		arg->inputFormat = IVAS_ENC_INPUT_MONO;
		#ifdef BINAURAL_AUDIO_CMDLINE
		arg->is_binaural = false;
		#endif
		arg->inputFormatConfig.stereoToMonoDownmix = false;
		arg->max_bwidth_user = false;
		arg->maxBandwidth = IVAS_ENC_BANDWIDTH_UNDEFINED;
		@@ -1225,16 +1209,6 @@ static bool parseCmdlIVAS_enc(
		* IVAS Formats
		-----------------------------------------------------------------/

		#ifdef BINAURAL_AUDIO_CMDLINE
		else if ( strcmp( argv_to_upper, "-BINAURAL" ) == 0 )
		{
		i++;
		if ( strcmp( argv_to_upper, "-BINAURAL" ) == 0 )
		{
		arg->is_binaural = true;
		}
		}
		#endif
		else if ( strcmp( argv_to_upper, "-STEREO" ) == 0 )
		{
		i++;
		@@ -1312,6 +1286,11 @@ static bool parseCmdlIVAS_enc(
		}
		#endif /* DEBUGGING */
		}
		else if ( strcmp( argv_to_upper, "-BINAURAL" ) == 0 )
		{
		arg->is_binaural = true;
		i++;
		}
		else if ( strcmp( argv_to_upper, "-ISM" ) == 0 )
		{
		arg->inputFormat = IVAS_ENC_INPUT_ISM;
		@@ -1703,9 +1682,6 @@ static void usage_enc( void )
		fprintf( stdout, "Options:\n" );
		fprintf( stdout, "--------\n" );
		fprintf( stdout, "EVS mono is default, for IVAS choose one of the following: -stereo, -ism, -sba, -masa, -mc\n" );
		#ifdef BINAURAL_AUDIO_CMDLINE
		fprintf( stdout, "-binaural : Optional indication that input is binaural audio (to be used with -stereo or -stereo_dmx_evs)\n" );
		#endif
		fprintf( stdout, "-stereo : Stereo format \n" );
		fprintf( stdout, "-ism (+)Ch Files : ISM format \n" );
		fprintf( stdout, " where Ch specifies the number of ISMs (1-4)\n" );
		@@ -1737,6 +1713,7 @@ static void usage_enc( void )
		fprintf( stdout, " alternatively, B can be a text file where each line contains \"nb_frames B\"\n" );
		fprintf( stdout, "-no_delay_cmp : Turn off delay compensation\n" );
		fprintf( stdout, "-stereo_dmx_evs : Activate stereo downmix function for EVS.\n" );
		fprintf( stdout, "-binaural : Optional indication that input is binaural audio (to be used with -stereo or -stereo_dmx_evs)\n" );
		fprintf( stdout, "-mime : Mime output bitstream file format\n" );
		fprintf( stdout, " The encoder produces TS26.445 Annex.2.6 Mime Storage Format, (not RFC4867 Mime Format).\n" );
		fprintf( stdout, " default output bitstream file format is G.192\n" );

apps/renderer.c

+0 −221

File changed.

Preview size limit exceeded, changes collapsed.

ci/test_vectors_available.py

0 → 100644

+19 −0

Original line number	Diff line number	Diff line
		import pytest
		import pathlib
		import json
		import itertools

		TEST_CONFIG_DIR = pathlib.Path(__file__).parent.parent.joinpath("scripts/config")
		TEST_CONFIGS = [f for f in TEST_CONFIG_DIR.iterdir() if f.name.startswith("ci_linux")]

		def get_testvectors_from_config(config) -> list:
		with open(config) as f:
		cfg = json.load(f)
		return list(cfg["inpaths"].values())

		TESTVECTORS = sorted(set(itertools.chain(*[get_testvectors_from_config(cfg) for cfg in TEST_CONFIGS])))

		@pytest.mark.parametrize("testvector", TESTVECTORS)
		def test_vectors_available(testvector):
		if not pathlib.Path(testvector).exists():
		raise FileNotFoundError(f"Testvector {testvector} can not be found")