Merge branch 'main' into update-basop-ci-branch (29192b2f) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+1 −3

Original line number	Diff line number	Diff line
		@@ -483,9 +483,7 @@ branch-is-up-to-date-with-main-post:

		- *get-basop-float-reference

		- 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 \|\| true
		- zero_errors=$(cat report-junit.xml \| grep -c 'errors="0"') \|\| true
		- if [ $zero_errors != 1 ]; then echo "Run errors encountered with TEST_SUITE=$TEST_SUITE !"; exit $EXIT_CODE_FAIL; fi
		- 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

		artifacts:
		name: "$CI_JOB_NAME--sha-$CI_COMMIT_SHORT_SHA--results"

ci/basop-pages/create_report_pages.py

+3 −3

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ from functools import partial

		FORMATS = ["Stereo", "ISM", "Multichannel", "MASA", "SBA", "OSBA", "OMASA", "Renderer"]

		CSV_DELIM = ";"
		CSV_DELIM = ","
		SUBPAGE_TMPL_CSS = """
		<style type="text/css">
		.tbase {border-collapse:collapse;border-spacing:0;}
		@@ -104,7 +104,7 @@ COLUMNS = [
		"Category",
		"Result",
		"MLD",
		"MAXIMUM ABS DIFF",
		"MAX_ABS_DIFF",
		"MIN_SSNR",
		"MIN_ODG",
		]
		@@ -158,7 +158,7 @@ def create_subpage(

		def write_out_csv(data, col_names, outfile):
		with open(outfile, "w") as f:
		writer = csv.DictWriter(f, col_names, delimiter=";")
		writer = csv.DictWriter(f, col_names, delimiter=CSV_DELIM)
		writer.writeheader()
		for row in data:
		writer.writerow(row)

ci/complexity_measurements/getWmops.sh

+4 −4

Original line number	Diff line number	Diff line
		@@ -83,6 +83,10 @@ fi
		./scripts/IvasBuildAndRunChecks.py $mode_arg_script -p $config_file --checks COMPLEXITY --create_complexity_tables ${wmopsFilenameFlc} -C $ivas_format $mode_arg -f ${ep} --oc $output_format
		ret_val_script=$?

		# for runs on ivas-float-update: creat copy of WMOPS csv file with static name so that it is easier to grab from the artifacts
		latest_wmops="${wmopsFilenameFlcDir}/latest_WMOPS.csv"
		cp ${wmopsFilenameFlc}_WMOPS.csv ${latest_wmops}

		# TODO: only split wmops and ram files
		./ci/complexity_measurements/split_by_levels.py $(ls ${wmopsFilenameFlc}*.csv)

		@@ -93,7 +97,6 @@ for suffix in "${split_suffixes[@]}"; do
		wmopsFilenameFlc_split="${wmopsFilenameFlc}_WMOPS${suffix}.csv"
		wmopsFilenameFlcLast_split="${wmopsFilenameFlcLast}_WMOPS${suffix}.csv"
		log_wmops_all_split="${destDir}/wmops/log_wmops_all${suffix}.txt"
		latest_wmops_split="${wmopsFilenameFlcDir}/latest_WMOPS${suffix}.csv"

		heapFilenameFlc_split="${wmopsFilenameFlc}_HEAP${suffix}.csv"
		stackFilenameFlc_split="${wmopsFilenameFlc}_STACK${suffix}.csv"
		@@ -105,9 +108,6 @@ for suffix in "${split_suffixes[@]}"; do
		### WMOPS
		${scriptDir}/parseNewsletterWmops.py ${wmopsFilenameFlc_split} ${wmopsFilenameFlcLast_split} ${commit_sha} ${shortDate} ${fullDate} >>${log_wmops_all_split}

		# create copy of WMOPS csv file with special name to easily get it from artifacts when comparing BASOP to float numbers
		cp ${wmopsFilenameFlc_split} ${latest_wmops_split}

		# get memory info for webpage
		### RAM
		${scriptDir}/mergeNewsletterRam.py ${heapFilenameFlc_split} ${stackFilenameFlc_split} >${ramFilenameFlc_split}

scripts/config/self_test.prm

+17 −19

Original line number	Diff line number	Diff line
		@@ -213,7 +213,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
		// stereo at 32 kbps, 48kHz in, 48kHz out, random FER at 18% with long bursts
		../IVAS_cod -stereo 32000 48 testv/stvST48c.wav bit
		eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_18pct_longburst.g192 bit_error
		../IVAS_dec STEREO 48 bit_error testv/stvST48c.wav_stereo_32000_48-48_STEREO_FER5_BURST.tst
		../IVAS_dec STEREO 48 bit_error testv/stvST48c.wav_stereo_32000_48-48_STEREO_FER10_BURST.tst

		// stereo at 48 kbps, 16kHz in, 16kHz out
		../IVAS_cod -stereo 48000 16 testv/stvST16c.wav bit
		@@ -221,7 +221,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_18pct_l

		// stereo at 64 kbps, 16kHz in, 16kHz out, random FER at 10%
		../IVAS_cod -stereo 64000 16 testv/stvST16c.wav bit
		eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
		eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_10pct.g192 bit_error
		../IVAS_dec STEREO 16 bit_error testv/stvST16c.wav_stereo_64000_16-16_FER10.tst

		// stereo at 96 kbps, 16kHz in, 16kHz out
		@@ -230,7 +230,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1

		// stereo at 128 kbps, 16kHz in, 16kHz out, random FER at 10%
		../IVAS_cod -stereo 128000 16 testv/stvST16c.wav bit
		eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
		eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_10pct.g192 bit_error
		../IVAS_dec STEREO 16 bit_error testv/stvST16c.wav_stereo_128000_16-16_FER10.tst

		// stereo at 48 kbps, 32kHz in, 32kHz out, random FER at 5%
		@@ -319,7 +319,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
		// 1 ISM with metadata at 13.2 kbps, 48 kHz in, 48 kHz out, DTX on, BINAURAL out, random FER at 5%
		../IVAS_cod -dtx -ism 1 testv/stvISM1.csv 13200 48 testv/stv48n.wav bit
		eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
		../IVAS_dec BINAURAL 48 bit_error testv/stv48n.wav_1ISM_13200_48-48_DTX_FER5_BINAURAL.tst
		../IVAS_dec BINAURAL 48 bit_error testv/stv48n.wav_1ISM_13200_48-48_DTX_BINAURAL_FER5.tst

		// 1 ISM with metadata at 16.4 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM IR out, bandwidth switching
		../IVAS_cod -max_band testv/ivas_bws_20fr_start_WB.txt -ism 1 testv/stvISM1.csv 16400 48 testv/stv1ISM48s.wav bit
		@@ -332,27 +332,27 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
		// 1 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM IR out, HR, random FER at 5%
		../IVAS_cod -ism 1 testv/stvISM1.csv 48000 48 testv/stv1ISM48s.wav bit
		eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
		../IVAS_dec -t testv/headrot_case00_3000_q.csv BINAURAL_ROOM_IR 48 bit_error testv/stv1ISM48s.wav_64000_48-48_binaural_room_HR.tst
		../IVAS_dec -t testv/headrot_case00_3000_q.csv BINAURAL_ROOM_IR 48 bit_error testv/stv1ISM48s.wav_64000_48-48_binaural_room_HR_FER5.tst

		// 1 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, BINAURAL out, HR, random FER at 5%
		../IVAS_cod -ism 1 testv/stvISM1.csv 48000 48 testv/stv1ISM48s.wav bit
		eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
		../IVAS_dec -t testv/headrot_case00_3000_q.csv BINAURAL 48 bit_error testv/stv1ISM48s.wav_64000_48-48_FER5_binaural_HR.tst
		../IVAS_dec -t testv/headrot_case00_3000_q.csv BINAURAL 48 bit_error testv/stv1ISM48s.wav_64000_48-48_binaural_HR_FER5.tst

		// 1 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM IR out, HR, exo, random FER at 5%
		../IVAS_cod -ism 1 testv/stvISM1.csv 48000 48 testv/stv1ISM48s.wav bit
		eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
		../IVAS_dec -t testv/headrot_case00_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL_ROOM_IR 48 bit_error testv/stv1ISM48s.wav_64000_48-48_FER5_binaural_room_HR_EXOF.tst
		../IVAS_dec -t testv/headrot_case00_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL_ROOM_IR 48 bit_error testv/stv1ISM48s.wav_64000_48-48_binaural_room_HR_EXOF_FER5.tst

		// 1 ISM with metadata at 80 kbps, 48 kHz in, 16 kHz out, BINAURAL out (Model from file), HR, random FER at 5%
		../IVAS_cod -ism 1 testv/stvISM1.csv 80000 48 testv/stv1ISM48s.wav bit
		eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
		../IVAS_dec -t testv/headrot_case00_3000_q.csv -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin BINAURAL 16 bit_error testv/stv1ISM48s.wav_80000_48-16_FER5_binaural_file_TDHR.tst
		../IVAS_dec -t testv/headrot_case00_3000_q.csv -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin BINAURAL 16 bit_error testv/stv1ISM48s.wav_80000_48-16_binaural_file_TDHR_FER5.tst

		// 1 ISM with metadata at 80 kbps, 48 kHz in, 16 kHz out, BINAURAL out (Model from file), HR, exo, random FER at 5%
		../IVAS_cod -ism 1 testv/stvISM1.csv 80000 48 testv/stv1ISM48s.wav bit
		eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
		../IVAS_dec -t testv/headrot_case00_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin BINAURAL 16 bit_error testv/stv1ISM48s.wav_80000_48-16_FER5_binaural_file_TDHR_EXOF.tst
		../IVAS_dec -t testv/headrot_case00_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin BINAURAL 16 bit_error testv/stv1ISM48s.wav_80000_48-16_binaural_file_TDHR_EXOF_FER5.tst

		// 1 ISM with metadata at 96 kbps, 48 kHz in, 16 kHz out, EXT out, bandwidth switching
		../IVAS_cod -max_band testv/ivas_bws_20fr_start_FB.txt -ism 1 testv/stvISM1.csv 96000 48 testv/stv1ISM48s.wav bit
		@@ -623,10 +623,6 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
		../IVAS_cod -sba 3 24400 32 testv/stv3OA32c_cut_16.0.wav bit
		../IVAS_dec -t testv/headrot.csv -otr avg BINAURAL 32 bit testv/stv3OA32c_cut_16.0.pcm_SBA_24400_32-32_Binaural_Headrot_OtrAvg.tst

		// SBA at 16.4 kbps, 48kHz in, 48kHz out, FOA out
		../IVAS_cod -sba 1 16400 48 testv/stvFOA48c_cut_16.0.wav bit
		../IVAS_dec FOA 48 bit testv/stvFOA48c_cut_16.0.wav_SBA_16400_48-48_FOA.tst

		// SBA at 24.4 kbps, 32kHz in, 32kHz out, BINAURAL out, HR, exo, OT
		../IVAS_cod -sba 3 24400 32 testv/stv3OA32c.wav bit
		../IVAS_dec -t testv/headrot.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv -otr avg BINAURAL 32 bit testv/stv3OA32c.pcm_SBA_24400_32-32_Binaural_Headrot_EXOF_OtrAvg.tst
		@@ -726,7 +722,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
		// SBA at 64 kbps, 32kHz in, 32kHz out, FOA out, DTX, random FER at 5%
		../IVAS_cod -dtx -sba 1 64000 32 testv/stvFOA32c_cut_.004.wav bit
		eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
		../IVAS_dec FOA 32 bit_error testv/stvFOA32c_cut_.004.wav_SBA_64000_32-32_FER5_DTX_FOA.tst
		../IVAS_dec FOA 32 bit_error testv/stvFOA32c.wav_SBA_64000_32-32_DTX_FOA_FER5.tst

		// SBA at 64 kbps, 48kHz in, 48kHz out, 5_1_4 out
		../IVAS_cod -sba 1 64000 48 testv/stvFOA48c.wav bit
		@@ -1582,6 +1578,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
		../IVAS_dec -non_diegetic_pan 80 STEREO 48 bit testv/stv1ISM48s.pcm_ISM_32000_48-48_STEREO_NON-DIEGETIC-PAN_80.tst



		// stereo at 32 kbps, 48 kHz in, 32 kHz out, DTX on, JBM Prof 0
		../IVAS_cod -stereo -dtx 32000 48 testv/stvST48n.wav bit
		networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_0.dat bit netsimoutput tracefile_sim 2 0
		@@ -1590,15 +1587,15 @@ networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_0.dat bit
		// 4 ISm with metadata at 64 kbps, 48 kHz in, 48 kHz out, DTX on, EXT out, JBM Prof 0
		../IVAS_cod -dtx -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 64000 48 testv/stv4ISM48n.wav bit
		networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_0.dat bit netsimoutput tracefile_sim 2 0
		../IVAS_dec -Tracefile tracefile_dec -VOIP EXT 48 netsimoutput testv/stv4ISM48s.wav_64000_48-48_EXT_JBM0.tst
		../IVAS_dec -Tracefile tracefile_dec -VOIP EXT 48 netsimoutput testv/stv4ISM48s.wav_64000_48-48_DTX_EXT_JBM0.tst

		// MASA 1dir 1TC at 13.2 kbps, 48kHz in, 32kHz out, DTX on, EXT out, JBM Prof 0
		../IVAS_cod -dtx -masa 1 testv/stv1MASA1TC48n.met 13200 48 testv/stv1MASA1TC48n.wav bit
		networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_0.dat bit netsimoutput tracefile_sim 2 0
		../IVAS_dec -Tracefile tracefile_dec -VOIP EXT 32 netsimoutput testv/stv1MASA1TC48n.wav_sw_48-32_EXT_JBM0.tst
		../IVAS_dec -Tracefile tracefile_dec -VOIP EXT 32 netsimoutput testv/stv1MASA1TC48n.wav_13200_48-32_DTX_EXT_JBM0.tst

		// SBA at 24.4 kbps, 32kHz in, 32kHz out, DTX on, BINAURAL out, JBM 0
		../IVAS_cod -sba 3 -dtx 24400 32 testv/stv3OA32c_cut_.004.wav bit
		../IVAS_cod -sba 3 -dtx 24400 32 testv/stv3OA32c.wav bit
		networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_0.dat bit netsimoutput tracefile_sim 2 0
		../IVAS_dec -Tracefile tracefile_dec -VOIP BINAURAL 32 netsimoutput testv/stv3OA32c.wav_SBA_24400_32-32_DTX_Binaural_JBM0.tst

		@@ -2034,9 +2031,10 @@ networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit
		../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 32000 48 testv/stv4ISM48s.wav bit
		../IVAS_dec -obj_edit ../scripts/object_edit/combined_edit.txt BINAURAL 48 bit testv/stv4ISM48s.wav_32000_48-48_BINAURAL_OE.tst

		// 4 ISM with metadata at 128 kbps, 48 kHz in, 48 kHz out, BINAURAL out, object editing, DISC
		// 4 ISM with metadata at 128 kbps, 48 kHz in, 48 kHz out, BINAURAL out, object editing, DISC, FER at 5%
		../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 128000 48 testv/stv4ISM48s.wav bit
		../IVAS_dec -obj_edit ../scripts/object_edit/combined_edit.txt BINAURAL 48 bit testv/stv4ISM48s.wav_128000_48-48_BINAURAL_OE.tst
		eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
		../IVAS_dec -obj_edit ../scripts/object_edit/combined_edit.txt BINAURAL 48 bit_error testv/stv4ISM48s.wav_128000_48-48_BINAURAL_OE_FER5.tst

		// 3 ISM with metadata at 24.4 kbps, 48 kHz in, 48 kHz out, FOA out, object editing, JBM Prof 5, PARAM_ISM
		../IVAS_cod -ism 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 24400 48 testv/stv3ISM48s.wav bit

scripts/config/self_test_ltv.prm

+34 −13

Original line number	Diff line number	Diff line
		@@ -58,7 +58,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
		// stereo at 32 kbps, 16kHz in, 16kHz out, random FER at 5%, DTX on
		../IVAS_cod -stereo -dtx 32000 16 testv/ltv16_STEREO.wav bit
		eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
		../IVAS_dec STEREO 16 bit_error testv/ltv16_STEREO.wav_stereo_32000_16-16_FER5_DTX.tst
		../IVAS_dec STEREO 16 bit_error testv/ltv16_STEREO.wav_stereo_32000_16-16_DTX_FER5.tst

		// stereo at 32 kbps, 16kHz in, 48kHz out, MONO out, random FER at 5%
		../IVAS_cod -stereo 32000 16 testv/ltv16_STEREO.wav bit
		@@ -213,7 +213,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
		// stereo at 32 kbps, 48kHz in, 48kHz out, random FER at 18% with long bursts
		../IVAS_cod -stereo 32000 48 testv/ltv48_STEREO.wav bit
		eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_18pct_longburst.g192 bit_error
		../IVAS_dec STEREO 48 bit_error testv/ltv48_STEREO.wav_stereo_32000_48-48_STEREO_FER5_BURST.tst
		../IVAS_dec STEREO 48 bit_error testv/ltv48_STEREO.wav_stereo_32000_48-48_STEREO_FER10_BURST.tst

		// stereo at 48 kbps, 16kHz in, 16kHz out
		../IVAS_cod -stereo 48000 16 testv/ltv16_STEREO.wav bit
		@@ -319,7 +319,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
		// 1 ISM with metadata at 13.2 kbps, 48 kHz in, 48 kHz out, DTX on, BINAURAL out, random FER at 5%
		../IVAS_cod -dtx -ism 1 testv/ltvISM1.csv 13200 48 testv/ltv48_1ISM.wav bit
		eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
		../IVAS_dec BINAURAL 48 bit_error testv/ltv48_1ISM.wav_1ISM_13200_48-48_DTX_FER5_BINAURAL.tst
		../IVAS_dec BINAURAL 48 bit_error testv/ltv48_1ISM.wav_1ISM_13200_48-48_DTX_BINAURAL_FER5.tst

		// 1 ISM with metadata at 16.4 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM IR out, bandwidth switching
		../IVAS_cod -max_band testv/ivas_bws_20fr_start_WB.txt -ism 1 testv/ltvISM1.csv 16400 48 testv/ltv48_1ISM.wav bit
		@@ -332,17 +332,17 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
		// 1 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM IR out, HR, random FER at 5%
		../IVAS_cod -ism 1 testv/ltvISM1.csv 48000 48 testv/ltv48_1ISM.wav bit
		eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
		../IVAS_dec -t testv/headrot_case00_3000_q.csv BINAURAL_ROOM_IR 48 bit_error testv/ltv48_1ISM.wav_64000_48-48_binaural_room_HR.tst
		../IVAS_dec -t testv/headrot_case00_3000_q.csv BINAURAL_ROOM_IR 48 bit_error testv/ltv48_1ISM.wav_64000_48-48_binaural_room_HR_FER5.tst

		// 1 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, BINAURAL out, HR, random FER at 5%
		../IVAS_cod -ism 1 testv/ltvISM1.csv 48000 48 testv/ltv48_1ISM.wav bit
		eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
		../IVAS_dec -t testv/headrot_case00_3000_q.csv BINAURAL 48 bit_error testv/ltv48_1ISM.wav_64000_48-48_binaural_HR.tst
		../IVAS_dec -t testv/headrot_case00_3000_q.csv BINAURAL 48 bit_error testv/ltv48_1ISM.wav_64000_48-48_binaural_HR_FER5.tst

		// 1 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM IR out, HR, exo, random FER at 5%
		../IVAS_cod -ism 1 testv/ltvISM1.csv 48000 48 testv/ltv48_1ISM.wav bit
		eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
		../IVAS_dec -t testv/headrot_case00_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL_ROOM_IR 48 bit_error testv/ltv48_1ISM.wav_64000_48-48_binaural_room_HR_EXOF.tst
		../IVAS_dec -t testv/headrot_case00_3000_q.csv -exof testv/headrot_case00_3000_q_combinedRotationTest.csv BINAURAL_ROOM_IR 48 bit_error testv/ltv48_1ISM.wav_64000_48-48_binaural_room_HR_EXOF_FER5.tst

		// 1 ISM with metadata at 80 kbps, 48 kHz in, 16 kHz out, BINAURAL out (Model from file), HR, random FER at 5%
		../IVAS_cod -ism 1 testv/ltvISM1.csv 80000 48 testv/ltv48_1ISM.wav bit
		@@ -722,7 +722,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
		// SBA at 64 kbps, 32kHz in, 32kHz out, FOA out, DTX, random FER at 5%
		../IVAS_cod -dtx -sba 1 64000 32 testv/ltv32_FOA.wav bit
		eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
		../IVAS_dec FOA 32 bit_error testv/ltv32_FOA.wav_SBA_64000_32-32_DTX_FOA.tst
		../IVAS_dec FOA 32 bit_error testv/ltv32_FOA.wav_SBA_64000_32-32_DTX_FOA_FER5.tst

		// SBA at 64 kbps, 48kHz in, 48kHz out, 5_1_4 out
		../IVAS_cod -sba 1 64000 48 testv/ltv48_FOA.wav bit
		@@ -1579,6 +1579,26 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1



		// stereo at 32 kbps, 48 kHz in, 32 kHz out, DTX on, JBM Prof 0
		../IVAS_cod -stereo -dtx 32000 48 testv/ltv48_STEREO.wav bit
		networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_0.dat bit netsimoutput tracefile_sim 2 0
		../IVAS_dec -Tracefile tracefile_dec -VOIP STEREO 32 netsimoutput testv/ltv48_STEREO.wav_stereo_32000_48-32_DTX_JBM0.tst

		// 4 ISm with metadata at 64 kbps, 48 kHz in, 48 kHz out, DTX on, EXT out, JBM Prof 0
		../IVAS_cod -dtx -ism 4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 64000 48 testv/ltv48_4ISM.wav bit
		networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_0.dat bit netsimoutput tracefile_sim 2 0
		../IVAS_dec -Tracefile tracefile_dec -VOIP EXT 48 netsimoutput testv/ltv48_4ISM.wav_64000_48-48_DTX_EXT_JBM0.tst

		// MASA 1dir 1TC at 13.2 kbps, 48kHz in, 32kHz out, DTX on, EXT out, JBM Prof 0
		../IVAS_cod -dtx -masa 1 testv/ltv48_MASA1TC.met 13200 48 testv/ltv48_MASA1TC.wav bit
		networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_0.dat bit netsimoutput tracefile_sim 2 0
		../IVAS_dec -Tracefile tracefile_dec -VOIP EXT 32 netsimoutput testv/ltv48_MASA1TC.wav_13200_48-32_DTX_EXT_JBM0.tst

		// SBA at 24.4 kbps, 32kHz in, 32kHz out, DTX on, BINAURAL out, JBM 0
		../IVAS_cod -sba 3 -dtx 24400 32 testv/ltv32_HOA3.wav bit
		networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_0.dat bit netsimoutput tracefile_sim 2 0
		../IVAS_dec -Tracefile tracefile_dec -VOIP BINAURAL 32 netsimoutput testv/ltv32_HOA3.wav_SBA_24400_32-32_DTX_Binaural_JBM0.tst

		// stereo at 48 kbps, 16 kHz in, 16 kHz out, DTX on, JBM Prof 5
		../IVAS_cod -stereo -dtx 48000 16 testv/ltv16_STEREO.wav bit
		networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit netsimoutput tracefile_sim 2 0
		@@ -1719,7 +1739,7 @@ networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit
		// OMASA 1TC 1ISM at 512 kbps, 32kHz in, 48kHz out, 7.1.4 out, FER at 5%
		../IVAS_cod -ism_masa 1 1 testv/ltv48_OMASA_1ISM_1TC_ISM1.csv testv/ltv48_OMASA_1ISM_1TC.met 512000 32 testv/ltv32_OMASA_1ISM_1TC.wav bit
		eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
		../IVAS_dec 7_1_4 48 bit_error testv/ltv32_OMASA_1ISM_1TC.wav_7_1_4_512000_32-48.tst
		../IVAS_dec 7_1_4 48 bit_error testv/ltv32_OMASA_1ISM_1TC.wav_7_1_4_512000_32-48_FER5.tst

		// OMASA 1TC 2ISM at 16.4 kbps, 16kHz in, 48kHz out, 5.1 out
		../IVAS_cod -ism_masa 2 1 testv/ltv48_OMASA_2ISM_1TC_ISM1.csv testv/ltv48_OMASA_2ISM_1TC_ISM2.csv testv/ltv48_OMASA_2ISM_1TC.met 16400 16 testv/ltv16_OMASA_2ISM_1TC.wav bit
		@@ -1728,7 +1748,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
		// OMASA 2TC 2ISM at 32 kbps, 48kHz in, 48kHz out, STEREO out, FER at 5%
		../IVAS_cod -ism_masa 2 2 testv/ltv48_OMASA_2ISM_2TC_ISM1.csv testv/ltv48_OMASA_2ISM_2TC_ISM2.csv testv/ltv48_OMASA_2ISM_2TC.met 32000 48 testv/ltv48_OMASA_2ISM_2TC.wav bit
		eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
		../IVAS_dec STEREO 48 bit_error testv/ltv48_OMASA_2ISM_2TC.wav_STEREO_32000_48-48.tst
		../IVAS_dec STEREO 48 bit_error testv/ltv48_OMASA_2ISM_2TC.wav_STEREO_32000_48-48_FER5.tst

		// OMASA 2TC 2ISM at 256 kbps, 48kHz in, 32kHz out, BINAURAL_ROOM_IR out
		../IVAS_cod -ism_masa 2 2 testv/ltv48_OMASA_2ISM_2TC_ISM1.csv NULL testv/ltv48_OMASA_2ISM_2TC.met 256000 48 testv/ltv48_OMASA_2ISM_2TC.wav bit
		@@ -1737,7 +1757,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
		// OMASA 1TC 3ISM at 24.4 kbps, 48kHz in, 16kHz out, FOA out, FER at 10%
		../IVAS_cod -ism_masa 3 1 testv/ltv48_OMASA_3ISM_1TC_ISM1.csv testv/ltv48_OMASA_3ISM_1TC_ISM2.csv testv/ltv48_OMASA_3ISM_1TC_ISM3.csv testv/ltv48_OMASA_3ISM_1TC.met 24400 48 testv/ltv48_OMASA_3ISM_1TC.wav bit
		eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_10pct.g192 bit_error
		../IVAS_dec FOA 16 bit_error testv/ltv48_OMASA_3ISM_1TC.wav_FOA_24400_48-16.tst
		../IVAS_dec FOA 16 bit_error testv/ltv48_OMASA_3ISM_1TC.wav_FOA_24400_48-16_FER10.tst

		// OMASA 2TC 3ISM at 32 kbps, 48kHz in, 16kHz out, STEREO out
		../IVAS_cod -ism_masa 3 2 testv/ltv48_OMASA_3ISM_2TC_ISM1.csv testv/ltv48_OMASA_3ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_3ISM_2TC.met 32000 48 testv/ltv48_OMASA_3ISM_2TC.wav bit
		@@ -1807,7 +1827,7 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1
		// OMASA 1TC 3ISM at br sw techs 13.2 to 512 kbps start 48 kbps, 48kHz in, 32kHz out, STEREO out, FER at 10%
		../IVAS_cod -ism_masa 3 1 testv/ltv48_OMASA_3ISM_1TC_ISM1.csv testv/ltv48_OMASA_3ISM_1TC_ISM2.csv testv/ltv48_OMASA_3ISM_1TC_ISM3.csv testv/ltv48_OMASA_3ISM_1TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_48k_omasatechs_3ism.bin 48 testv/ltv48_OMASA_3ISM_1TC.wav bit
		eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_10pct.g192 bit_error
		../IVAS_dec STEREO 32 bit_error testv/ltv48_OMASA_3ISM_1TC.wav_STEREO_sw_48-32.tst
		../IVAS_dec STEREO 32 bit_error testv/ltv48_OMASA_3ISM_1TC.wav_STEREO_sw_48-32_FER10.tst

		// OMASA 2TC 3ISM at br sw techs 13.2 to 512 kbps start 24.4 kbps, 32kHz in, 48kHz out, 5.1.4 out
		../IVAS_cod -ism_masa 3 2 testv/ltv48_OMASA_3ISM_2TC_ISM1.csv testv/ltv48_OMASA_3ISM_2TC_ISM2.csv testv/ltv48_OMASA_3ISM_2TC_ISM3.csv testv/ltv48_OMASA_3ISM_2TC.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_24k4_omasatechs_3ism.bin 32 testv/ltv32_OMASA_3ISM_2TC.wav bit
		@@ -2011,9 +2031,10 @@ networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit
		../IVAS_cod -ism 4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 32000 48 testv/ltv48_4ISM.wav bit
		../IVAS_dec -obj_edit ../scripts/object_edit/combined_edit.txt BINAURAL 48 bit testv/ltv48_4ISM.wav_32000_48-48_BINAURAL_OE.tst

		// 4 ISM with metadata at 128 kbps, 48 kHz in, 48 kHz out, BINAURAL out, object editing, DISC
		// 4 ISM with metadata at 128 kbps, 48 kHz in, 48 kHz out, BINAURAL out, object editing, DISC, FER at 5%
		../IVAS_cod -ism 4 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv testv/ltvISM4.csv 128000 48 testv/ltv48_4ISM.wav bit
		../IVAS_dec -obj_edit ../scripts/object_edit/combined_edit.txt BINAURAL 48 bit testv/ltv48_4ISM.wav_128000_48-48_BINAURAL_OE.tst
		eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error
		../IVAS_dec -obj_edit ../scripts/object_edit/combined_edit.txt BINAURAL 48 bit_error testv/ltv48_4ISM.wav_128000_48-48_BINAURAL_OE_FER5.tst

		// 3 ISM with metadata at 24.4 kbps, 48 kHz in, 48 kHz out, FOA out, object editing, JBM Prof 5, PARAM_ISM
		../IVAS_cod -ism 3 testv/ltvISM1.csv testv/ltvISM2.csv testv/ltvISM3.csv 24400 48 testv/ltv48_3ISM.wav bit