Merge branch 'main' into b_20231122_binaural_reverb_setup (259aedb5) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+20 −13

Original line number	Diff line number	Diff line
		@@ -352,6 +352,7 @@ build-codec-include-split-linux-make:
		- .rules-basis
		script:
		- *print-common-info
		- *enable-split-rendering
		- make -j INCLUDE_SPLIT=1 2>&1 \| tee $BUILD_OUTPUT
		# need to use the "\|\| exit $?" suffix to get the allowed_failure return code, otherwise the job fails with code 1...<
		- ci/check_for_warnings.py $BUILD_OUTPUT \|\| exit $?
		@@ -362,6 +363,7 @@ build-codec-include-split-linux-cmake:
		- .rules-basis
		script:
		- *print-common-info
		- *enable-split-rendering
		- mkdir build
		- cd build
		- cmake .. -DINCLUDE_SPLIT=1
		@@ -390,6 +392,9 @@ build-codec-windows-include-split-cmake:
		script:
		- *print-common-info-windows
		- $winoutdata = $null
		- get-content .\lib_com\options.h \| %{$_ -replace "/\#define[\s]SPLIT_REND_WITH_HEAD_ROT[\s]\/", "#define SPLIT_REND_WITH_HEAD_ROT"} \| set-content -Path ./options_patched.h
		- rm ./lib_com/options.h
		- mv ./options_patched.h ./lib_com/options.h
		- cmake -DINCLUDE_SPLIT=1 -G "Visual Studio 15 2017" . -Bbuild
		- cmake --build build -j \| tee -variable winoutdata
		- $winoutdata \| Out-File $BUILD_OUTPUT -Encoding Utf8
		@@ -995,8 +1000,9 @@ check-first-frame-is-sid:
		- exit_code_foa=0

		# run all modes and cut bitstream to start with an SID. Use stereo output to limit runtime, test is only about decoding
		- ism_md_cmd="--ism_metadata_files /usr/local/ltv/ltvISM1.csv /usr/local/ltv/ltvISM2.csv /usr/local/ltv/ltvISM3.csv /usr/local/ltv/ltvISM4.csv"
		- modes=$(scripts/runIvasCodec.py -l \| grep dtx \| grep -vE "FOA\|HOA" )
		- scripts/runIvasCodec.py -z console -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 200 -U 0:20 --oc stereo \|\| exit_code_no_sba=$?
		- scripts/runIvasCodec.py -z console -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 200 -U 0:20 --oc stereo $ism_md_cmd \|\| exit_code_no_sba=$?
		- modes=$(scripts/runIvasCodec.py -l \| grep dtx \| grep -E "HOA")
		- scripts/runIvasCodec.py -z console -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 100 -U 70:80 --oc stereo \|\| exit_code_hoa=$?
		- modes=$(scripts/runIvasCodec.py -l \| grep dtx \| grep "FOA")
		@@ -1567,6 +1573,17 @@ sanitizer-test-osba-hoa3-ism2:
		- *update-ltv-repo
		- python3 ci/run_scheduled_sanitizer_test.py HOA3-ISM2 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS

		sanitizer-test-omasa-ism4:
		extends: .sanitizer-test-schedule-B
		rules:
		- if: $SANITIZER_SCHEDULE_B
		when: delayed
		start_in: 97.5 hours
		timeout: 10 hours
		script:
		- *update-ltv-repo
		- python3 ci/run_scheduled_sanitizer_test.py MASA-ISM4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS


		### --- sanitizer schedule C ---

		@@ -1603,22 +1620,12 @@ sanitizer-test-omasa-ism3:
		- *update-ltv-repo
		- python3 ci/run_scheduled_sanitizer_test.py MASA-ISM3 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS

		sanitizer-test-omasa-ism4:
		extends: .sanitizer-test-schedule-C
		rules:
		- if: $SANITIZER_SCHEDULE_C
		when: delayed
		start_in: 30 hours
		script:
		- *update-ltv-repo
		- python3 ci/run_scheduled_sanitizer_test.py MASA-ISM4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS

		sanitizer-test-osba-hoa3-ism3:
		extends: .sanitizer-test-schedule-C
		rules:
		- if: $SANITIZER_SCHEDULE_C
		when: delayed
		start_in: 40 hours
		start_in: 30 hours
		timeout: 7.5 hours
		script:
		- *update-ltv-repo
		@@ -1629,7 +1636,7 @@ sanitizer-test-osba-hoa3-ism4:
		rules:
		- if: $SANITIZER_SCHEDULE_C
		when: delayed
		start_in: 47.5 hours
		start_in: 37.5 hours
		timeout: 7.5 hours
		script:
		- *update-ltv-repo

Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -120,7 +120,7 @@ VPATH = $(SRC_DIRS)
		# Split rendering files
		SRCS_SPLIT_REND = ivas_CQMFDecoder.c ivas_CQMFEncoder.c ivas_PerceptualModel.c ivas_PredDecoder.c \
		ivas_PredEncoder.c ivas_RMSEnvGrouping.c ivas_MSPred.c ivas_NoiseGen.c \
		ivas_cldfb_codec_bitstream.c ivas_splitRend_lcld_dec.c ivas_splitRend_lcld_enc.c \
		ivas_splitRend_lcld_dec.c ivas_splitRend_lcld_enc.c \
		ivas_splitRendererPLC.c ivas_splitRendererPost.c ivas_splitRendererPre.c \
		ivas_splitRenderer_utils.c split_rend_bfi_file_reader.c split_render_file_read_write.c \
		ivas_lcld_tables.c

apps/renderer.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2875,7 +2875,7 @@ static void parseOption(
		assert( numOptionValues == 1 );
		if ( !parseRenderFramesize( optionValues[0], &args->render_framesize ) )
		{
		fprintf( stderr, "Unknown or invalid option for LFE position: %s\n", optionValues[0] );
		fprintf( stderr, "Unknown or invalid option for frame size: %s\n", optionValues[0] );
		exit( -1 );
		}

ci/run_scheduled_sanitizer_test.py

+2 −2

Original line number	Diff line number	Diff line
		@@ -110,8 +110,8 @@ def get_modes(in_format: str) -> list:
		def get_md_file_command(in_format: str) -> list:

		cmd = list()
		if in_format.startswith("ISM"):
		cmd.append("--metadata_files")
		if "ISM" in in_format:
		cmd.append("--ism_metadata_files")
		md_filename = "/usr/local/ltv/ltvISM{}.csv"
		n = int(in_format[-1])
		cmd.extend([md_filename.format(i) for i in range(1, n + 1)])

ci/smoke_test.sh

+1 −1

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@ fi

		cfg=./scripts/config/ci_linux.json
		dly_profile=./scripts/dly_error_profiles/dly_error_profile_10.dat
		ism_md_cmd="--metadata_files /usr/local/ltv/ltvISM1.csv /usr/local/ltv/ltvISM2.csv /usr/local/ltv/ltvISM3.csv /usr/local/ltv/ltvISM4.csv"
		ism_md_cmd="--ism_metadata_files /usr/local/ltv/ltvISM1.csv /usr/local/ltv/ltvISM2.csv /usr/local/ltv/ltvISM3.csv /usr/local/ltv/ltvISM4.csv"
		duration_arg="-U 1:2"
		verbosity_cmd="-z console"