move stuff from basop-ci-branch to main (8152bd1e) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+39 −37

Original line number	Diff line number	Diff line
		@@ -65,15 +65,6 @@ workflow:
		echo "Commit time was $CI_COMMIT_TIMESTAMP"
		("echo 'System time is'", "Get-Date -Format 'dddd dd/MM/yyyy HH:mm K'") \| Invoke-Expression

		.get-basop-float-reference: &get-basop-float-reference
		- git clone -b $BASOP_REFERENCE_BRANCH https://forge.3gpp.org/rep/sa4/audio/ivas-basop.git --single-branch --depth 1 ivas-basop
		- cd ivas-basop
		- git status
		- make -j
		- cd -
		- cp ivas-basop/IVAS_cod ./
		- cp ivas-basop/IVAS_dec ./

		.merge-request-comparison-setup-codec: &merge-request-comparison-setup-codec
		### build test binaries, initial clean for paranoia reasons
		- bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/disable-debugging-macro.sh
		@@ -241,19 +232,28 @@ branch-is-up-to-date-with-main-post:
		- .test-job-linux
		- .rules-merge-request-to-basop-ci-branch
		tags:
		- ivas-linux
		- ivas-linux-fast
		before_script:
		- !reference [.job-linux, before_script]
		- python3 ci/remove_unsupported_testcases.py scripts/config/self_test.prm scripts/config/self_test_ltv.prm
		- python3 tests/create_short_testvectors.py
		- python3 scripts/prepare_combined_format_inputs.py

		- bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/update-ltv-repo.sh
		- bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/copy-ltv-files-to-testv-dir.sh

		- *get-basop-float-reference
		- bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/float/build-binaries-from-basop-repo.sh $BASOP_BRANCH

		- python3 -m pytest $TEST_SUITE $PYTEST_ARGS --update_ref 1 --ref_encoder_path IVAS_cod --ref_decoder_path IVAS_dec --html=report.html --self-contained-html --junit-xml=report-junit.xml --testcase_timeout=$TESTCASE_TIMEOUT
		- testcase_timeout=$TESTCASE_TIMEOUT
		- if [ "$BASOP_BRANCH" == "main" ]; then testcase_timeout=$TESTCASE_TIMEOUT_LTV_SANITIZERS; fi

		# hack for renderer tests to match the expected naming
		- mv IVAS_rend IVAS_rend_ref

		- if [ "$BASOP_BRANCH" == "ivas-float-update" ]; then
		- python3 -m pytest $TEST_SUITE $PYTEST_ARGS --update_ref 1 --create_ref -k "not rtpdump" --ref_encoder_path IVAS_cod --ref_decoder_path IVAS_dec --html=report.html --self-contained-html --junit-xml=report-junit.xml --testcase_timeout=$testcase_timeout
		- else
		- python3 -m pytest $TEST_SUITE $PYTEST_ARGS --update_ref 1 --create_ref --ref_encoder_path IVAS_cod --ref_decoder_path IVAS_dec --html=report.html --self-contained-html --junit-xml=report-junit.xml --testcase_timeout=$testcase_timeout
		- fi

		artifacts:
		name: "$CI_JOB_NAME--sha-$CI_COMMIT_SHORT_SHA--results"
		@@ -268,56 +268,59 @@ branch-is-up-to-date-with-main-post:
		junit:
		- report-junit.xml

		### The stv jobs are run for both main and ivas-float-update
		basop-ref-compat-stv:
		extends:
		- .basop-ci-branch-compat-template
		variables:
		TEST_SUITE: "$SHORT_TEST_SUITE tests/renderer"
		TEST_SUITE: "$SHORT_TEST_SUITE tests/renderer_short"
		TESTCASE_TIMEOUT: $TESTCASE_TIMEOUT_STV_SANITIZERS
		parallel:
		matrix:
		- BASOP_BRANCH:
		- main
		- ivas-float-update
		script:
		- exit 0

		basop-ref-compat-ltv:
		basop-ref-compat-encoder-dmx-comp:
		extends:
		- .basop-ci-branch-compat-template
		tags:
		- ivas-linux-fast
		variables:
		TEST_SUITE: $LONG_TEST_SUITE
		TESTCASE_TIMEOUT: $TESTCASE_TIMEOUT_LTV_SANITIZERS
		TEST_SUITE: $SHORT_TEST_SUITE_ENCODER
		# USING PYTEST_ADDOPTS env var did not work for some reason when testing locally - maybe because this is a custom option
		PYTEST_ARGS: "--compare_enc_dmx"
		TESTCASE_TIMEOUT: $TESTCASE_TIMEOUT_STV_SANITIZERS
		parallel:
		matrix:
		- BASOP_BRANCH:
		- main
		- ivas-float-update
		script:
		- exit 0

		basop-ref-compat-encoder-stv:
		### The ltv jobs are run for ivas-float-update only to save time

		basop-ref-compat-ltv:
		extends:
		- .basop-ci-branch-compat-template
		variables:
		TEST_SUITE: $SHORT_TEST_SUITE_ENCODER
		TESTCASE_TIMEOUT: $TESTCASE_TIMEOUT_STV_SANITIZERS
		TEST_SUITE: $LONG_TEST_SUITE
		BASOP_BRANCH: "ivas-float-update"
		TESTCASE_TIMEOUT: $TESTCASE_TIMEOUT_LTV_SANITIZERS
		script:
		- exit 0

		basop-ref-compat-encoder-ltv:
		extends:
		- .basop-ci-branch-compat-template
		tags:
		- ivas-linux-fast
		variables:
		TEST_SUITE: $LONG_TEST_SUITE_ENCODER
		BASOP_BRANCH: "ivas-float-update"
		TESTCASE_TIMEOUT: $TESTCASE_TIMEOUT_LTV_SANITIZERS
		script:
		- exit 0

		basop-ref-compat-encoder-dmx-comp:
		extends:
		- .basop-ci-branch-compat-template
		variables:
		TEST_SUITE: $SHORT_TEST_SUITE_ENCODER
		# USING PYTEST_ADDOPTS env var did not work for some reason when testing locally - maybe because this is a custom option
		PYTEST_ARGS: "--compare_enc_dmx"
		TESTCASE_TIMEOUT: $TESTCASE_TIMEOUT_STV_SANITIZERS
		script:
		- exit 0

		# ---------------------------------------------------------------
		# Build jobs
		@@ -415,11 +418,10 @@ codec-smoke-test:
		# LTV update needed as ltv ISM metadata files are used
		- bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/update-ltv-repo.sh

		# for MRs to basop-ci-branch, we want to test with the BASOP float reference build
		# for MRs to basop-ci-branch-pc, we want to test with the BASOP float reference build
		# per default, the smoke test builds the current repo again with WMOPS activated to catch unbalanced instrumentation macros
		- if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" = "basop-ci-branch" ]; then
		- python3 scripts/smoketest-basop-filter.py scripts/config/ivas_modes.json --inline
		- *get-basop-float-reference
		- bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/float/build-binaries-from-basop-repo.sh ivas-float-update
		- bash ci/smoke_test.sh coverage
		- else
		- bash ci/smoke_test.sh

ci/basop-pages/create_report_pages.py

+2 −2

Original line number	Diff line number	Diff line
		@@ -102,7 +102,7 @@ COLUMNS = [
		"testcase",
		"Format",
		"Category",
		"Result",
		"result",
		"MLD",
		"MAX_ABS_DIFF",
		"MIN_SSNR",
		@@ -187,7 +187,7 @@ def tr_from_row(row, id_current, id_previous):
		prev = row[f"{c}-{id_previous}"]
		curr = row[f"{c}-{id_current}"]

		if c == "Result":
		if c == "result":
		# print errors in bold red font
		td_tmpl = TD_TMPL_INCREASE if prev == "ERROR" else TD_TMPL_NORMAL
		tr.append(td_tmpl.format(prev))

scripts/basop_create_ignorelist_for_ubsan.py

+6 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,12 @@ basop_files = here.glob("lib_/basop.[ch]")

		ignorefiles = sorted(set(non_ivas_files) - set(basop_files))

		# add files here that should not be ignored
		# NOTE: this is meant to be used in BASOP main where everything has the _fx suffix in the filenames
		remove_files = ["lib_dec/jbm_pcmdsp_apa_fx.c"]
		for file in remove_files:
		ignorefiles.remove(pathlib.Path(file))

		ignorefunctions = ["L_add_o", "L_add_co", "L_sub_o", "shl_o", "L_deposit_h"]

		with open("ubsan_ignorelist.txt", "w") as f:

scripts/config/self_test_basop_encoder.prm

+65 −65

Original line number	Diff line number	Diff line
		@@ -237,7 +237,7 @@

		// SBA at 160 kbps, 48kHz in, 48kHz out, FOA out
		../IVAS_cod -sba 1 160000 48 testv/stvFOA48c.wav bit
		../IVAS_dec FOA 48 bit testv/stvFOA48c.wav_SBA_160000_48-48_BINAURAL_ROOM.tst
		../IVAS_dec FOA 48 bit testv/stvFOA48c.wav_SBA_160000_48-48_FOA.tst

		// SBA at 160 kbps, 32kHz in, 32kHz out, FOA out
		../IVAS_cod -sba 1 160000 32 testv/stvFOA32c.wav bit
		@@ -436,133 +436,133 @@
		../IVAS_cod -ism_sba 1 2 testv/stvISM1.csv 24400 48 testv/stvOSBA_1ISM_2OA48c.wav bit
		../IVAS_dec EXT 48 bit testv/stvOSBA_1ISM_2OA48c.wav_EXT_24400_48-48.tst

		// OMASA 2Dir2TC 4ISM at br sw techs 13.2 to 512 kbps start 384 kbps, 48kHz in, 48kHz out, BINAURAL out
		// OMASA 2Dir2TC 4ISM at br sw techs 13.2 to 512 kbps start 384 kbps, 48kHz in, 48kHz out, EXT out
		../IVAS_cod -ism_masa 4 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv testv/stv2MASA2TC48c.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_384k_omasatechs_4ism.bin 48 testv/stvOMASA_4ISM_2MASA2TC48c.wav bit
		../IVAS_dec BINAURAL 48 bit testv/stvOMASA_4ISM_2MASA2TC48c.wav_BINAURAL_sw_48-48.tst
		../IVAS_dec EXT 48 bit testv/stvOMASA_4ISM_2MASA2TC48c.wav_EXT_sw_48-48.tst

		// OMASA 2Dir2TC 4ISM at 64 kbps, 48kHz in, 48kHz out, BINAURAL out
		// OMASA 2Dir2TC 4ISM at 64 kbps, 48kHz in, 48kHz out, EXT out
		../IVAS_cod -ism_masa 4 2 testv/stvISM1.csv NULL NULL testv/stvISM4.csv testv/stv2MASA2TC48c.met 64000 48 testv/stvOMASA_4ISM_2MASA2TC48c.wav bit
		../IVAS_dec BINAURAL 48 bit testv/stvOMASA_4ISM_2MASA2TC48c.wav_BINAURAL_64000_48-48.tst
		../IVAS_dec EXT 48 bit testv/stvOMASA_4ISM_2MASA2TC48c.wav_EXT_64000_48-48.tst

		// OMASA 2Dir2TC 4ISM at 384 kbps, 48kHz in, 48kHz out, BINAURAL out
		// OMASA 2Dir2TC 4ISM at 384 kbps, 48kHz in, 48kHz out, EXT out
		../IVAS_cod -ism_masa 4 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv testv/stv2MASA2TC48c.met 384000 48 testv/stvOMASA_4ISM_2MASA2TC48c.wav bit
		../IVAS_dec BINAURAL 48 bit testv/stvOMASA_4ISM_2MASA2TC48c.wav_BINAURAL_384000_48-48.tst
		../IVAS_dec EXT 48 bit testv/stvOMASA_4ISM_2MASA2TC48c.wav_EXT_384000_48-48.tst

		// OMASA 2Dir2TC 4ISM at 256 kbps, 48kHz in, 48kHz out, BINAURAL out
		// OMASA 2Dir2TC 4ISM at 256 kbps, 48kHz in, 48kHz out, EXT out
		../IVAS_cod -ism_masa 4 2 testv/stvISM1.csv testv/stvISM2.csv NULL testv/stvISM4.csv testv/stv2MASA2TC48c.met 256000 48 testv/stvOMASA_4ISM_2MASA2TC48c.wav bit
		../IVAS_dec BINAURAL 48 bit testv/stvOMASA_4ISM_2MASA2TC48c.wav_BINAURAL56000_48-48.tst
		../IVAS_dec EXT 48 bit testv/stvOMASA_4ISM_2MASA2TC48c.wav_EXT56000_48-48.tst

		// OMASA 2Dir2TC 4ISM at 192 kbps, 48kHz in, 48kHz out, BINAURAL out
		// OMASA 2Dir2TC 4ISM at 192 kbps, 48kHz in, 48kHz out, EXT out
		../IVAS_cod -ism_masa 4 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv testv/stv2MASA2TC48c.met 192000 48 testv/stvOMASA_4ISM_2MASA2TC48c.wav bit
		../IVAS_dec BINAURAL 48 bit testv/stvOMASA_4ISM_2MASA2TC48c.wav_BINAURAL_192000_48-48.tst
		../IVAS_dec EXT 48 bit testv/stvOMASA_4ISM_2MASA2TC48c.wav_EXT_192000_48-48.tst

		// OMASA 2Dir2TC 4ISM at 13.2 kbps, 48kHz in, 48kHz out, BINAURAL out
		// OMASA 2Dir2TC 4ISM at 13.2 kbps, 48kHz in, 48kHz out, EXT out
		../IVAS_cod -ism_masa 4 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv testv/stv2MASA2TC48c.met 13200 48 testv/stvOMASA_4ISM_2MASA2TC48c.wav bit
		../IVAS_dec BINAURAL 48 bit testv/stvOMASA_4ISM_2MASA2TC48c.wav_BINAURAL_13200_48-48.tst
		../IVAS_dec EXT 48 bit testv/stvOMASA_4ISM_2MASA2TC48c.wav_EXT_13200_48-48.tst

		// OMASA 2Dir2TC 4ISM 48 kbps 48kHz in, 48kHz out, BINAURAL
		// OMASA 2Dir2TC 4ISM 48 kbps 48kHz in, 48kHz out, EXT
		../IVAS_cod -ism_masa 4 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv testv/stv2MASA2TC48c.met 48000 48 testv/stvOMASA_4ISM_2MASA2TC48c.wav bit
		../IVAS_dec BINAURAL 48 bit testv/stvOMASA_4ISM_2MASA2TC48c.wav_BINAURAL_48000_48-48_BINAURAL.tst
		../IVAS_dec EXT 48 bit testv/stvOMASA_4ISM_2MASA2TC48c.wav_EXT_48000_48-48_EXT.tst

		// OMASA 2Dir2TC 3ISM at br sw techs 13.2 to 512 kbps start 160 kbps, 48kHz in, 48kHz out, BINAURAL out
		// OMASA 2Dir2TC 3ISM at br sw techs 13.2 to 512 kbps start 160 kbps, 48kHz in, 48kHz out, EXT out
		../IVAS_cod -ism_masa 3 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stv2MASA2TC48c.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_160k_omasatechs_3ism.bin 48 testv/stvOMASA_3ISM_2MASA2TC48c.wav bit
		../IVAS_dec BINAURAL 48 bit testv/stvOMASA_3ISM_2MASA2TC48c.wav_BINAURAL_sw_48-48.tst
		../IVAS_dec EXT 48 bit testv/stvOMASA_3ISM_2MASA2TC48c.wav_EXT_sw_48-48.tst

		// OMASA 2Dir2TC 3ISM at 80 kbps, 32kHz in, 16kHz out, BINAURAL.4 out
		// OMASA 2Dir2TC 3ISM at 80 kbps, 32kHz in, 16kHz out, EXT.4 out
		../IVAS_cod -ism_masa 3 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stv2MASA2TC48c.met 80000 32 testv/stvOMASA_3ISM_2MASA2TC32c.wav bit
		../IVAS_dec BINAURAL 16 bit testv/stvOMASA_3ISM_2MASA2TC32c.wav_BINAURAL_80000_32-16.tst
		../IVAS_dec EXT 16 bit testv/stvOMASA_3ISM_2MASA2TC32c.wav_EXT_80000_32-16.tst

		// OMASA 2Dir2TC 3ISM at 48 kbps, 48kHz in, 48kHz out, BINAURAL out
		// OMASA 2Dir2TC 3ISM at 48 kbps, 48kHz in, 48kHz out, EXT out
		../IVAS_cod -ism_masa 3 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stv2MASA2TC48c.met 48000 48 testv/stvOMASA_3ISM_2MASA2TC48c.wav bit
		../IVAS_dec BINAURAL 48 bit testv/stvOMASA_3ISM_2MASA2TC48c.wav_BINAURAL_48000_48-48.tst
		../IVAS_dec EXT 48 bit testv/stvOMASA_3ISM_2MASA2TC48c.wav_EXT_48000_48-48.tst

		// OMASA 2Dir2TC 3ISM at 32 kbps, 48kHz in, 48kHz out, BINAURAL out
		// OMASA 2Dir2TC 3ISM at 32 kbps, 48kHz in, 48kHz out, EXT out
		../IVAS_cod -ism_masa 3 2 NULL NULL NULL testv/stv2MASA2TC48c.met 32000 48 testv/stvOMASA_3ISM_2MASA2TC48c.wav bit
		../IVAS_dec BINAURAL 48 bit testv/stvOMASA_3ISM_2MASA2TC48c.wav_BINAURAL_32000_48-48.tst
		../IVAS_dec EXT 48 bit testv/stvOMASA_3ISM_2MASA2TC48c.wav_EXT_32000_48-48.tst

		// OMASA 2Dir2TC 2ISM at br sw techs 13.2 to 512 kbps start 48 kbps, 48kHz in, 48kHz out, BINAURAL out
		// OMASA 2Dir2TC 2ISM at br sw techs 13.2 to 512 kbps start 48 kbps, 48kHz in, 48kHz out, EXT out
		../IVAS_cod -ism_masa 2 2 testv/stvISM1.csv NULL testv/stv2MASA2TC48c.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_48k_omasatechs_2ism.bin 48 testv/stvOMASA_2ISM_2MASA2TC48c.wav bit
		../IVAS_dec BINAURAL 48 bit testv/stvOMASA_2ISM_2MASA2TC48c.wav_BINAURAL_sw_48-48.tst
		../IVAS_dec EXT 48 bit testv/stvOMASA_2ISM_2MASA2TC48c.wav_EXT_sw_48-48.tst

		// OMASA 2Dir2TC 2ISM at 32 kbps, 48kHz in, 48kHz out, BINAURAL out
		// OMASA 2Dir2TC 2ISM at 32 kbps, 48kHz in, 48kHz out, EXT out
		../IVAS_cod -ism_masa 2 2 testv/stvISM1.csv testv/stvISM2.csv testv/stv2MASA2TC48c.met 32000 48 testv/stvOMASA_2ISM_2MASA2TC48c.wav bit
		../IVAS_dec BINAURAL 48 bit testv/stvOMASA_2ISM_2MASA2TC48c.wav_BINAURAL_32000_48-48.tst
		../IVAS_dec EXT 48 bit testv/stvOMASA_2ISM_2MASA2TC48c.wav_EXT_32000_48-48.tst

		// OMASA 2Dir2TC 1ISM at br sw techs 13.2 to 512 kbps start 24.4 kbps, 48kHz in, 48kHz out, BINAURAL out
		// OMASA 2Dir2TC 1ISM at br sw techs 13.2 to 512 kbps start 24.4 kbps, 48kHz in, 48kHz out, EXT out
		../IVAS_cod -ism_masa 1 2 testv/stvISM1.csv testv/stv2MASA2TC48c.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_24k4_omasatechs_1ism.bin 48 testv/stvOMASA_1ISM_2MASA2TC48c.wav bit
		../IVAS_dec BINAURAL 48 bit testv/stvOMASA_1ISM_2MASA2TC48c.wav_BINAURAL_sw_48-48.tst
		../IVAS_dec EXT 48 bit testv/stvOMASA_1ISM_2MASA2TC48c.wav_EXT_sw_48-48.tst

		// OMASA 2Dir2TC 1ISM at 13.2 kbps, 48kHz in, 48kHz out, BINAURAL out
		// OMASA 2Dir2TC 1ISM at 13.2 kbps, 48kHz in, 48kHz out, EXT out
		../IVAS_cod -ism_masa 1 2 NULL testv/stv2MASA2TC48c.met 13200 48 testv/stvOMASA_1ISM_2MASA2TC48c.wav bit
		../IVAS_dec BINAURAL 48 bit testv/stvOMASA_1ISM_2MASA2TC48c.wav_BINAURAL_13200_48-48.tst
		../IVAS_dec EXT 48 bit testv/stvOMASA_1ISM_2MASA2TC48c.wav_EXT_13200_48-48.tst

		// OMASA 2Dir1TC 4ISM at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL out
		// OMASA 2Dir1TC 4ISM at 24.4 kbps, 48kHz in, 48kHz out, EXT out
		../IVAS_cod -ism_masa 4 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv testv/stv2MASA1TC48c.met 24400 48 testv/stvOMASA_4ISM_2MASA1TC48c.wav bit
		../IVAS_dec BINAURAL 48 bit testv/stvOMASA_4ISM_2MASA1TC48c.wav_BINAURAL4400_48-48.tst
		../IVAS_dec EXT 48 bit testv/stvOMASA_4ISM_2MASA1TC48c.wav_EXT4400_48-48.tst

		// OMASA 2Dir1TC 3ISM at br sw techs 13.2 to 512 kbps start 48 kbps, 48kHz in, 32kHz out, BINAURAL out
		// OMASA 2Dir1TC 3ISM at br sw techs 13.2 to 512 kbps start 48 kbps, 48kHz in, 32kHz out, EXT out
		../IVAS_cod -ism_masa 3 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stv2MASA1TC48c.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_48k_omasatechs_3ism.bin 48 testv/stvOMASA_3ISM_2MASA1TC48c.wav bit
		../IVAS_dec BINAURAL 32 bit testv/stvOMASA_3ISM_2MASA1TC48c.wav_BINAURAL_sw_48-32.tst
		../IVAS_dec EXT 32 bit testv/stvOMASA_3ISM_2MASA1TC48c.wav_EXT_sw_48-32.tst

		// OMASA 2Dir1TC 3ISM at 96 kbps, 48kHz in, 48kHz out, BINAURAL out
		// OMASA 2Dir1TC 3ISM at 96 kbps, 48kHz in, 48kHz out, EXT out
		../IVAS_cod -ism_masa 3 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stv2MASA1TC48c.met 96000 48 testv/stvOMASA_3ISM_2MASA1TC48c.wav bit
		../IVAS_dec BINAURAL 48 bit testv/stvOMASA_3ISM_2MASA1TC48c.wav_BINAURAL_96000_48-48.tst
		../IVAS_dec EXT 48 bit testv/stvOMASA_3ISM_2MASA1TC48c.wav_EXT_96000_48-48.tst

		// OMASA 2Dir1TC 3ISM at 24.4 kbps, 48kHz in, 16kHz out, BINAURAL out
		// OMASA 2Dir1TC 3ISM at 24.4 kbps, 48kHz in, 16kHz out, EXT out
		../IVAS_cod -ism_masa 3 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stv2MASA1TC48c.met 24400 48 testv/stvOMASA_3ISM_2MASA1TC48c.wav bit
		../IVAS_dec BINAURAL 16 bit testv/stvOMASA_3ISM_2MASA1TC48c.wav_BINAURAL_24400_48-16.tst
		../IVAS_dec EXT 16 bit testv/stvOMASA_3ISM_2MASA1TC48c.wav_EXT_24400_48-16.tst

		// OMASA 2Dir1TC 1ISM at 512 kbps, 32kHz in, 48kHz out, BINAURAL out
		// OMASA 2Dir1TC 1ISM at 512 kbps, 32kHz in, 48kHz out, EXT out
		../IVAS_cod -ism_masa 1 1 testv/stvISM1.csv testv/stv2MASA1TC48c.met 512000 32 testv/stvOMASA_1ISM_2MASA1TC32c.wav bit
		../IVAS_dec BINAURAL 48 bit testv/stvOMASA_1ISM_2MASA1TC32c.wav_BINAURAL_512000_32-48.tst
		../IVAS_dec EXT 48 bit testv/stvOMASA_1ISM_2MASA1TC32c.wav_EXT_512000_32-48.tst

		// OMASA 1Dir2TC 4ISM at br sw techs 13.2 to 512 kbps start 80 kbps, 48kHz in, 48kHz out, BINAURAL out
		// OMASA 1Dir2TC 4ISM at br sw techs 13.2 to 512 kbps start 80 kbps, 48kHz in, 48kHz out, EXT out
		../IVAS_cod -ism_masa 4 2 NULL testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv testv/stv1MASA2TC48c.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_80k_omasatechs_4ism.bin 48 testv/stvOMASA_4ISM_1MASA2TC48c.wav bit
		../IVAS_dec BINAURAL 48 bit testv/stvOMASA_4ISM_1MASA2TC48c.wav_BINAURAL_sw_48-48.tst
		../IVAS_dec EXT 48 bit testv/stvOMASA_4ISM_1MASA2TC48c.wav_EXT_sw_48-48.tst

		// OMASA 1Dir2TC 4ISM at 80 kbps, 48kHz in, 48kHz out, BINAURAL out
		// OMASA 1Dir2TC 4ISM at 80 kbps, 48kHz in, 48kHz out, EXT out
		../IVAS_cod -ism_masa 4 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv testv/stv1MASA2TC48c.met 80000 48 testv/stvOMASA_4ISM_1MASA2TC48c.wav bit
		../IVAS_dec BINAURAL 48 bit testv/stvOMASA_4ISM_1MASA2TC48c.wav_BINAURAL_80000_48-48.tst
		../IVAS_dec EXT 48 bit testv/stvOMASA_4ISM_1MASA2TC48c.wav_EXT_80000_48-48.tst

		// OMASA 1Dir2TC 4ISM at 32 kbps, 48kHz in, 48kHz out, BINAURAL out
		// OMASA 1Dir2TC 4ISM at 32 kbps, 48kHz in, 48kHz out, EXT out
		../IVAS_cod -ism_masa 4 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv testv/stv1MASA2TC48c.met 32000 48 testv/stvOMASA_4ISM_1MASA2TC48c.wav bit
		../IVAS_dec BINAURAL 48 bit testv/stvOMASA_4ISM_1MASA2TC48c.wav_BINAURAL_32000_48-48.tst
		../IVAS_dec EXT 48 bit testv/stvOMASA_4ISM_1MASA2TC48c.wav_EXT_32000_48-48.tst

		// OMASA 1Dir2TC 3ISM at br sw techs 13.2 to 512 kbps start 24.4 kbps, 32kHz in, 48kHz out, BINAURAL out
		// OMASA 1Dir2TC 3ISM at br sw techs 13.2 to 512 kbps start 24.4 kbps, 32kHz in, 48kHz out, EXT out
		../IVAS_cod -ism_masa 3 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stv1MASA2TC48c.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_24k4_omasatechs_3ism.bin 32 testv/stvOMASA_3ISM_1MASA2TC32c.wav bit
		../IVAS_dec BINAURAL 48 bit testv/stvOMASA_3ISM_1MASA2TC32c.wav_BINAURAL_sw_32-48.tst
		../IVAS_dec EXT 48 bit testv/stvOMASA_3ISM_1MASA2TC32c.wav_EXT_sw_32-48.tst

		// OMASA 1Dir2TC 3ISM at 32 kbps, 48kHz in, 16kHz out, BINAURAL out
		// OMASA 1Dir2TC 3ISM at 32 kbps, 48kHz in, 16kHz out, EXT out
		../IVAS_cod -ism_masa 3 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stv1MASA2TC48c.met 32000 48 testv/stvOMASA_3ISM_1MASA2TC48c.wav bit
		../IVAS_dec BINAURAL 16 bit testv/stvOMASA_3ISM_1MASA2TC48c.wav_BINAURAL_32000_48-16.tst
		../IVAS_dec EXT 16 bit testv/stvOMASA_3ISM_1MASA2TC48c.wav_EXT_32000_48-16.tst

		// OMASA 1Dir2TC 3ISM at 160 kbps, 16kHz in, 32kHz out, BINAURAL out
		// OMASA 1Dir2TC 3ISM at 160 kbps, 16kHz in, 32kHz out, EXT out
		../IVAS_cod -ism_masa 3 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stv1MASA2TC48c.met 160000 16 testv/stvOMASA_3ISM_1MASA2TC16c.wav bit
		../IVAS_dec BINAURAL 32 bit testv/stvOMASA_3ISM_1MASA2TC16c.wav_BINAURAL_160000_16-32.tst
		../IVAS_dec EXT 32 bit testv/stvOMASA_3ISM_1MASA2TC16c.wav_EXT_160000_16-32.tst

		// OMASA 1Dir2TC 2ISM at 256 kbps, 48kHz in, 32kHz out, BINAURAL out
		// OMASA 1Dir2TC 2ISM at 256 kbps, 48kHz in, 32kHz out, EXT out
		../IVAS_cod -ism_masa 2 2 testv/stvISM1.csv NULL testv/stv1MASA2TC48c.met 256000 48 testv/stvOMASA_2ISM_1MASA2TC48c.wav bit
		../IVAS_dec BINAURAL 32 bit testv/stvOMASA_2ISM_1MASA2TC48c.wav_BINAURAL56000_48-32.tst
		../IVAS_dec EXT 32 bit testv/stvOMASA_2ISM_1MASA2TC48c.wav_EXT56000_48-32.tst

		// OMASA 1Dir2TC 1ISM at 128 kbps, 48kHz in, 48kHz out, BINAURAL out, bandwidth switching
		// OMASA 1Dir2TC 1ISM at 128 kbps, 48kHz in, 48kHz out, EXT out, bandwidth switching
		../IVAS_cod -max_band testv/ivas_bws_20fr_start_SWB.txt -ism_masa 1 2 testv/stvISM1.csv testv/stv1MASA2TC48c.met 128000 48 testv/stvOMASA_1ISM_1MASA2TC48c.wav bit
		../IVAS_dec BINAURAL 48 bit testv/stvOMASA_1ISM_1MASA2TC48c.wav_BINAURAL_128000_48-48.tst
		../IVAS_dec EXT 48 bit testv/stvOMASA_1ISM_1MASA2TC48c.wav_EXT_128000_48-48.tst

		// OMASA 1Dir1TC 4ISM at br sw techs 13.2 to 512 kbps start 32 kbps, 48kHz in, 48kHz out, BINAURAL out
		// OMASA 1Dir1TC 4ISM at br sw techs 13.2 to 512 kbps start 32 kbps, 48kHz in, 48kHz out, EXT out
		../IVAS_cod -ism_masa 4 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv testv/stv1MASA1TC48c.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_32k_omasatechs_4ism.bin 48 testv/stvOMASA_4ISM_1MASA1TC48c.wav bit
		../IVAS_dec BINAURAL 48 bit testv/stvOMASA_4ISM_1MASA1TC48c.wav_BINAURAL_sw_48-48.tst
		../IVAS_dec EXT 48 bit testv/stvOMASA_4ISM_1MASA1TC48c.wav_EXT_sw_48-48.tst

		// OMASA 1Dir1TC 4ISM at 48 kbps, 48kHz in, 48kHz out, BINAURAL out
		// OMASA 1Dir1TC 4ISM at 48 kbps, 48kHz in, 48kHz out, EXT out
		../IVAS_cod -ism_masa 4 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv testv/stv1MASA1TC48c.met 48000 48 testv/stvOMASA_4ISM_1MASA1TC48c.wav bit
		../IVAS_dec BINAURAL 48 bit testv/stvOMASA_4ISM_1MASA1TC48c.wav_BINAURAL_48000_48-48.tst
		../IVAS_dec EXT 48 bit testv/stvOMASA_4ISM_1MASA1TC48c.wav_EXT_48000_48-48.tst

		// OMASA 1Dir1TC 3ISM at 64 kbps, 32kHz in, 32kHz out, BINAURAL out
		// OMASA 1Dir1TC 3ISM at 64 kbps, 32kHz in, 32kHz out, EXT out
		../IVAS_cod -ism_masa 3 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stv1MASA1TC48c.met 64000 32 testv/stvOMASA_3ISM_1MASA1TC32c.wav bit
		../IVAS_dec BINAURAL 32 bit testv/stvOMASA_3ISM_1MASA1TC32c.wav_BINAURAL_64000_32-32.tst
		../IVAS_dec EXT 32 bit testv/stvOMASA_3ISM_1MASA1TC32c.wav_EXT_64000_32-32.tst

		// OMASA 1Dir1TC 2ISM at 16.4 kbps, 16kHz in, 48kHz out, BINAURAL out
		// OMASA 1Dir1TC 2ISM at 16.4 kbps, 16kHz in, 48kHz out, EXT out
		../IVAS_cod -ism_masa 2 1 testv/stvISM1.csv testv/stvISM2.csv testv/stv1MASA1TC48c.met 16400 16 testv/stvOMASA_2ISM_1MASA1TC16c.wav bit
		../IVAS_dec BINAURAL 48 bit testv/stvOMASA_2ISM_1MASA1TC16c.wav_BINAURAL_16400_16-48.tst
		../IVAS_dec EXT 48 bit testv/stvOMASA_2ISM_1MASA1TC16c.wav_EXT_16400_16-48.tst

		// Multi-channel 7_1_4 bitrate switching from 24.4 kbps to 256 kbps, 48kHz in, 32kHz out, 7_1_4 out
		../IVAS_cod -mc 7_1_4 ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/stv714MC48c.wav bit

scripts/config/self_test_ltv_basop_encoder.prm

+65 −65

File changed.

Preview size limit exceeded, changes collapsed.