Merge branch 'main' into b_20240126_OSBA-Xover-BR (e9c86d11) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+40 −28

Original line number	Diff line number	Diff line
		@@ -244,6 +244,7 @@ stages:
		extends: .test-job-linux
		before_script:
		- if [ ! -d "$TESTV_DIR" ]; then mkdir -p $TESTV_DIR; fi
		- python3 scripts/prepare_combined_format_inputs.py
		- cp -r scripts/testv/* $TESTV_DIR/

		# ---------------------------------------------------------------
		@@ -440,7 +441,7 @@ codec-smoke-test:
		# code selftest testvectors with memory-sanitizer binaries
		codec-msan:
		extends:
		- .test-job-linux
		- .test-job-linux-needs-testv-dir
		- .rules-merge-request
		stage: test
		needs: ["build-codec-sanitizers-linux"]
		@@ -463,7 +464,7 @@ codec-msan:
		# code selftest testvectors with address-sanitizer binaries
		codec-asan:
		extends:
		- .test-job-linux
		- .test-job-linux-needs-testv-dir
		- .rules-merge-request
		stage: test
		needs: ["build-codec-sanitizers-linux"]
		@@ -486,7 +487,7 @@ codec-asan:
		# code selftest testvectors with address-sanitizer binaries
		codec-usan:
		extends:
		- .test-job-linux
		- .test-job-linux-needs-testv-dir
		- .rules-merge-request
		stage: test
		needs: ["build-codec-sanitizers-linux"]
		@@ -515,7 +516,8 @@ renderer-smoke-test:
		stage: test
		script:
		- make -j IVAS_rend
		- python3 -m pytest -q -n auto -rA --junit-xml=report-junit.xml tests/renderer/test_renderer.py
		- testcase_timeout=60
		- python3 -m pytest -q -n auto -rA --junit-xml=report-junit.xml tests/renderer/test_renderer.py --testcase_timeout=$testcase_timeout
		artifacts:
		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"
		expire_in: 1 week
		@@ -537,7 +539,8 @@ renderer-asan:
		script:
		- cmake -B cmake-build -G "Unix Makefiles" -DCLANG=asan -DCOPY_EXECUTABLES_FROM_BUILD_DIR=true
		- cmake --build cmake-build -- -j
		- python3 -m pytest -q -n auto -rA --junit-xml=report-junit.xml tests/renderer/test_renderer.py
		- testcase_timeout=180
		- python3 -m pytest -q -n auto -rA --junit-xml=report-junit.xml tests/renderer/test_renderer.py --testcase_timeout=$testcase_timeout

		artifacts:
		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"
		@@ -560,7 +563,8 @@ renderer-msan:
		script:
		- cmake -B cmake-build -G "Unix Makefiles" -DCLANG=msan -DCOPY_EXECUTABLES_FROM_BUILD_DIR=true
		- cmake --build cmake-build -- -j
		- python3 -m pytest -q -n auto -rA --junit-xml=report-junit.xml tests/renderer/test_renderer.py
		- testcase_timeout=180
		- python3 -m pytest -q -n auto -rA --junit-xml=report-junit.xml tests/renderer/test_renderer.py --testcase_timeout=$testcase_timeout

		artifacts:
		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"
		@@ -583,7 +587,8 @@ renderer-usan:
		script:
		- cmake -B cmake-build -G "Unix Makefiles" -DCLANG=usan -DCOPY_EXECUTABLES_FROM_BUILD_DIR=true
		- cmake --build cmake-build -- -j
		- UBSAN_OPTIONS=suppressions=scripts/ubsan.supp,report_error_type=1,log_path=usan_log_catchall python3 -m pytest -q -n auto -rA --junit-xml=report-junit.xml tests/renderer/test_renderer.py
		- testcase_timeout=180
		- UBSAN_OPTIONS=suppressions=scripts/ubsan.supp,report_error_type=1,log_path=usan_log_catchall python3 -m pytest -q -n auto -rA --junit-xml=report-junit.xml tests/renderer/test_renderer.py --testcase_timeout=$testcase_timeout
		- grep_exit_code=0
		- touch usan_log_empty # Creates an empty file, this is to avoid "grep: usan_log_*: No such file or directory" in case no USAN failures are reported from pytest
		- grep UndefinedBehaviorSanitizer usan_log_* \|\| grep_exit_code=$?
		@@ -603,7 +608,7 @@ renderer-usan:
		# compare renderer bitexactness between target and source branch
		renderer-pytest-on-merge-request:
		extends:
		- .test-job-linux
		- .test-job-linux-needs-testv-dir
		- .rules-merge-request
		needs: ["build-codec-linux-make"]
		# TODO: set reasonable timeout, will most likely take less
		@@ -625,13 +630,14 @@ renderer-pytest-on-merge-request:
		- if [ $ref_using_main == 0 ]; then git checkout $source_branch_commit_sha; fi

		- exit_code=0
		- python3 -m pytest -q --log-level ERROR -n auto -rA --html=report.html --self-contained-html --junit-xml=report-junit.xml tests/renderer/test_renderer.py --create_ref \|\| exit_code=$?
		- testcase_timeout=60
		- python3 -m pytest -q --log-level ERROR -n auto -rA --html=report.html --self-contained-html --junit-xml=report-junit.xml tests/renderer/test_renderer.py --create_ref --testcase_timeout=$testcase_timeout \|\| exit_code=$?

		### Run test using branch scripts and input
		- if [ $ref_using_main == 1 ]; then git checkout $source_branch_commit_sha; fi

		# run test
		- python3 -m pytest -q --log-level ERROR -n auto -rA --html=report.html --self-contained-html --junit-xml=report-junit.xml tests/renderer/test_renderer_.py --create_cut \|\| exit_code=$?
		- python3 -m pytest -q --log-level ERROR -n auto -rA --html=report.html --self-contained-html --junit-xml=report-junit.xml tests/renderer/test_renderer_.py --create_cut --testcase_timeout=$testcase_timeout \|\| exit_code=$?
		- zero_errors=$(cat report-junit.xml \| grep -c 'errors="0"') \|\| true

		- *merge-request-comparison-check
		@@ -661,7 +667,8 @@ split-rendering-smoke-test:
		script:
		- *enable-split-rendering
		- make -j INCLUDE_SPLIT=1
		- python3 -m pytest -q -n auto -rA --junit-xml=report-junit.xml tests/split_rendering/test_split_rendering.py
		- testcase_timeout=10
		- python3 -m pytest -q -n auto -rA --junit-xml=report-junit.xml tests/split_rendering/test_split_rendering.py --testcase_timeout=$testcase_timeout
		artifacts:
		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"
		expire_in: 1 week
		@@ -676,7 +683,7 @@ split-rendering-smoke-test:
		# compare split-rendering bitexactness between target and source branch
		split-rendering-pytest-on-merge-request:
		extends:
		- .test-job-linux
		- .test-job-linux-needs-testv-dir
		- .rules-merge-request
		needs: ["build-codec-linux-make"]
		# TODO: set reasonable timeout, will most likely take less
		@@ -711,7 +718,8 @@ split-rendering-pytest-on-merge-request:
		- if [ $ref_using_main == 0 ]; then git restore lib_com/options.h; fi # Revert changes back before checking out another branch to avoid conflicts
		- if [ $ref_using_main == 0 ]; then git checkout $source_branch_commit_sha; fi
		- exit_code=0
		- python3 -m pytest -q --log-level ERROR -n auto -rA --html=report.html --self-contained-html --junit-xml=report-junit.xml tests/split_rendering/test_split_rendering.py --create_ref \|\| exit_code=$?
		- testcase_timeout=60
		- python3 -m pytest -q --log-level ERROR -n auto -rA --html=report.html --self-contained-html --junit-xml=report-junit.xml tests/split_rendering/test_split_rendering.py --create_ref --testcase_timeout=$testcase_timeout \|\| exit_code=$?

		# back to source branch
		- git restore lib_com/options.h # Revert changes back before checking out another branch to avoid conflicts
		@@ -725,7 +733,7 @@ split-rendering-pytest-on-merge-request:
		- if [ $ref_using_main == 1 ]; then git checkout $source_branch_commit_sha; fi

		# run test
		- python3 -m pytest -q --log-level ERROR -n auto -rA --html=report.html --self-contained-html --junit-xml=report-junit.xml tests/split_rendering/test_split_rendering.py --create_cut \|\| exit_code=$?
		- python3 -m pytest -q --log-level ERROR -n auto -rA --html=report.html --self-contained-html --junit-xml=report-junit.xml tests/split_rendering/test_split_rendering.py --create_cut --testcase_timeout=$testcase_timeout \|\| exit_code=$?
		- zero_errors=$(cat report-junit.xml \| grep -c 'errors="0"') \|\| true

		- *merge-request-comparison-check
		@@ -748,7 +756,7 @@ split-rendering-pytest-on-merge-request:
		# compare bit exactness between target and source branch
		ivas-pytest-on-merge-request:
		extends:
		- .test-job-linux
		- .test-job-linux-needs-testv-dir
		- .rules-merge-request
		stage: compare
		needs: ["build-codec-linux-cmake", "codec-smoke-test"]
		@@ -780,7 +788,8 @@ ivas-pytest-on-merge-request:

		### run pytest
		- exit_code=0
		- python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --html=report.html --self-contained-html --junit-xml=report-junit.xml \|\| exit_code=$?
		- testcase_timeout=60
		- python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --html=report.html --self-contained-html --junit-xml=report-junit.xml --testcase_timeout=$testcase_timeout \|\| exit_code=$?
		- zero_errors=$(cat report-junit.xml \| grep -c 'errors="0"') \|\| true

		- *merge-request-comparison-check
		@@ -804,7 +813,7 @@ ivas-pytest-on-merge-request:
		# Check interop IVAS_cod_test -> IVAS_dec_ref
		ivas-interop-on-merge-request:
		extends:
		- .test-job-linux
		- .test-job-linux-needs-testv-dir
		- .rules-merge-request
		stage: test
		needs: ["build-codec-linux-cmake"]
		@@ -880,14 +889,15 @@ evs-pytest-on-merge-request:

		### prepare pytest
		# create references
		- python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR/test_param_file.py -v --update_ref 1 -m create_ref --param_file scripts/config/self_test_evs.prm
		- testcase_timeout=60
		- python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR/test_param_file.py -v --update_ref 1 -m create_ref --param_file scripts/config/self_test_evs.prm --testcase_timeout=$testcase_timeout

		### Run test using branch scripts and input
		- if [ $ref_using_main == 1 ]; then git checkout $source_branch_commit_sha; fi

		### run pytest for EVS cases
		- exit_code=0
		- python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR/test_param_file.py -v --param_file scripts/config/self_test_evs.prm --html=report.html --self-contained-html --junit-xml=report-junit-evs.xml \|\| exit_code=$?
		- python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR/test_param_file.py -v --param_file scripts/config/self_test_evs.prm --html=report.html --self-contained-html --junit-xml=report-junit-evs.xml --testcase_timeout=$testcase_timeout \|\| exit_code=$?
		- zero_errors=$(cat report-junit-evs.xml \| grep -c 'errors="0"') \|\| true

		- *merge-request-comparison-check
		@@ -989,11 +999,11 @@ check-first-frame-is-sid:
		# 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 $ism_md_cmd \|\| 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 --timeout 10 \|\| 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=$?
		- scripts/runIvasCodec.py -z console -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 100 -U 70:80 --oc stereo --timeout 10 \|\| exit_code_hoa=$?
		- modes=$(scripts/runIvasCodec.py -l \| grep dtx \| grep "FOA")
		- scripts/runIvasCodec.py -z console -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 100 -U 75:110 --oc stereo \|\| exit_code_foa=$?
		- scripts/runIvasCodec.py -z console -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 100 -U 75:110 --oc stereo timeout 10 \|\| exit_code_foa=$?

		- if [ $exit_code_no_sba -ne 0 ] \|\| [ $exit_code_hoa -ne 0 ] \|\| [ $exit_code_hoa -ne 0 ]; then exit 1; fi
		artifacts:
		@@ -1076,7 +1086,7 @@ be-2-evs-linux:

		codec-comparison-on-main-push:
		extends:
		- .test-job-linux
		- .test-job-linux-needs-testv-dir
		- .rules-main-push
		stage: compare
		needs: ["build-codec-linux-cmake"]
		@@ -1129,15 +1139,16 @@ codec-comparison-on-main-push:
		- mv IVAS_cod_test IVAS_cod
		- mv IVAS_dec_test IVAS_dec
		# create references
		- python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --update_ref 1 -m create_ref
		- python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --update_ref 1 -m create_ref_part2
		- testcase_timeout=60
		- python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --update_ref 1 -m create_ref --testcase_timeout=$testcase_timeout
		- python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --update_ref 1 -m create_ref_part2 --testcase_timeout=$testcase_timeout

		### re-checkout the latest commit here, if ref_using_main is set
		- if [ $ref_using_main -eq 1 ]; then git checkout $latest_commit;fi

		### run pytest
		- exit_code=0
		- python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --html=report.html --self-contained-html --junit-xml=report-junit.xml \|\| exit_code=$?
		- python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --html=report.html --self-contained-html --junit-xml=report-junit.xml --testcase_timeout=$testcase_timeout \|\| exit_code=$?
		- if [ $exit_code -eq 1 ] && [ $non_be_flag == 0 ]; then echo "pytest run had failures and non-BE flag not present"; exit $EXIT_CODE_FAIL; fi
		- zero_errors=$(cat report-junit.xml \| grep -c 'errors="0"') \|\| true
		- if [ $exit_code -eq 1 ] && [ $zero_errors == 1 ]; then echo "pytest run had failures, but no errors and non-BE flag present"; exit $EXIT_CODE_NON_BE; fi
		@@ -1231,11 +1242,12 @@ test-long-self-test:

		# create references
		- exit_code_ref=0
		- python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR/test_param_file.py -v --update_ref 1 -m create_ref --param_file scripts/config/self_test_ltv.prm \|\| exit_code_ref=$?
		- testcase_timeout=300
		- python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR/test_param_file.py -v --update_ref 1 -m create_ref --param_file scripts/config/self_test_ltv.prm --testcase_timeout=$testcase_timeout \|\| exit_code_ref=$?

		### run pytest self-test using long test vectors
		- exit_code=0
		- python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR/test_param_file.py -v --param_file scripts/config/self_test_ltv.prm --html=report-ltv.html --self-contained-html --junit-xml=report-junit-ltv.xml \|\| exit_code=$?
		- python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR/test_param_file.py -v --param_file scripts/config/self_test_ltv.prm --html=report-ltv.html --self-contained-html --junit-xml=report-junit-ltv.xml --testcase_timeout=$testcase_timeout \|\| exit_code=$?
		- zero_errors=$(cat report-junit-ltv.xml \| grep -c 'errors="0"') \|\| true

		- if [ $zero_errors != 1 ]; then echo "Run errors encountered!"; exit $EXIT_CODE_FAIL; fi

ci/run_scheduled_sanitizer_test.py

+3 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,7 @@ N_FRAMES_DLY_PROFILE = 7500
		GENPATT_CMD = f"gen-patt -tailstat -fer -g192 -gamma 0 -rate 0.15 -tol 0.001 -reset -n {N_FRAMES_DLY_PROFILE} {EP_FILE}"
		MC_MODES = ["5_1", "5_1_2", "5_1_4", "7_1", "7_1_4"]
		AMBISONICS_MODES = ["HOA3", "HOA2", "FOA", "PlanarHOA3", "PlanarHOA2", "PlanarFOA"]
		TIMEOUT = 60 * 15 # timeout of 15 minutes per en/decoding to safeguard against endless loops

		CONSOLE_OUT_FILE = "output_san.txt"

		@@ -148,6 +149,8 @@ def run_check(in_format: str, out_formats: list, tests: list, run_fec: bool = Tr
		*md_file_command,
		"--usan_supp_file",
		USAN_SUPP_FILE,
		"--timeout",
		str(TIMEOUT),
		]

		print(

ci/smoke_test.sh

+9 −8

Original line number	Diff line number	Diff line
		@@ -56,6 +56,7 @@ dly_profile=./scripts/dly_error_profiles/dly_error_profile_10.dat
		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"
		timeout_cmd="--timeout 5"
		ep_file="ci/complexity_measurements/ep_10pct_fer.g192"

		if [ $BUILD -eq 1 ];then
		@@ -84,21 +85,21 @@ echo "\n======================= 0. preparing combined format test inputs =======
		ism_modes=$(./scripts/runIvasCodec.py -l \| grep ^ISM)
		non_ism_modes=$(./scripts/runIvasCodec.py -l \| grep -v ^ISM)
		echo "\n======================= 1. non-ism modes no FEC =======================\n\n"
		./scripts/runIvasCodec.py $verbosity_cmd -m $non_ism_modes -p $cfg $duration_arg \| tee smoke_test_output.txt
		./scripts/runIvasCodec.py $verbosity_cmd -m $non_ism_modes -p $cfg $duration_arg $timeout_cmd \| tee smoke_test_output.txt
		echo "\n======================= 2. ism modes no FEC =======================\n\n"
		./scripts/runIvasCodec.py $verbosity_cmd -m $ism_modes -p $cfg $duration_arg $ism_md_cmd \| tee smoke_test_output.txt
		./scripts/runIvasCodec.py $verbosity_cmd -m $ism_modes -p $cfg $duration_arg $ism_md_cmd $timeout_cmd \| tee smoke_test_output.txt
		# run the decoding again, but with 15% frame loss
		echo "\n======================= 3. all modes with FEC =======================\n\n"
		./scripts/runIvasCodec.py $verbosity_cmd -p $cfg $duration_arg -f="$ep_file" --decoder_only \| tee smoke_test_output_plc.txt
		./scripts/runIvasCodec.py $verbosity_cmd -p $cfg $duration_arg -f="$ep_file" --decoder_only $timeout_cmd \| tee smoke_test_output_plc.txt

		# run JBM modes - EXT is excluded as not supported yet
		# OMASA disabled for now
		modes_with_no_ext_out=$(./scripts/runIvasCodec.py -l \| grep -v ^MASA \| grep -v ^ISM \| grep -v OMASA)
		modes_with_ext_out=$(./scripts/runIvasCodec.py -l \| grep 'MASA\\|ISM' \| grep -v ^ISM+ \| grep -v OMASA)
		echo "\n======================= 4. JBM, modes with no EXT =======================\n\n"
		./scripts/runIvasCodec.py $verbosity_cmd -m $modes_with_no_ext_out -p $cfg $duration_arg --decoder_only --jbm_file $dly_profile \| tee smoke_test_output_jbm_noEXT.txt
		./scripts/runIvasCodec.py $verbosity_cmd -m $modes_with_no_ext_out -p $cfg $duration_arg --decoder_only --jbm_file $dly_profile $timeout_cmd \| tee smoke_test_output_jbm_noEXT.txt
		echo "\n======================= 5. JBM, modes with EXT =======================\n\n"
		./scripts/runIvasCodec.py $verbosity_cmd -m $modes_with_ext_out -p $cfg $duration_arg --decoder_only --jbm_file $dly_profile --oc BINAURAL BINAURAL_ROOM_IR mono stereo FOA HOA3 5_1 7_1_4 \| tee -a smoke_test_output_jbm_noEXT.txt
		./scripts/runIvasCodec.py $verbosity_cmd -m $modes_with_ext_out -p $cfg $duration_arg --decoder_only --jbm_file $dly_profile --oc BINAURAL BINAURAL_ROOM_IR mono stereo FOA HOA3 5_1 7_1_4 $timeout_cmd \| tee -a smoke_test_output_jbm_noEXT.txt

		# run all modes with binaural output using external files
		modes_with_bin_out="FOA HOA2 HOA3 PlanarFOA PlanarHOA2 PlanarHOA3 MASA MC ISM1 ISM2 ISM3 ISM4"
		@@ -107,14 +108,14 @@ bin_out_modes="BINAURAL BINAURAL_ROOM_IR"
		echo "\n======================= 6. binaural out with HRTF files - WB =======================\n\n"
		wb_modes=$(./scripts/runIvasCodec.py -l -C $modes_with_bin_out \| grep _wb_)
		hrtf_wb="../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin"
		./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $wb_modes $duration_arg -D="-hrtf ${hrtf_wb}" --decoder_only --oc $bin_out_modes \| tee -a smoke_test_output_hrtf.txt
		./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $wb_modes $duration_arg -D="-hrtf ${hrtf_wb}" --decoder_only --oc $bin_out_modes $timeout_cmd \| tee -a smoke_test_output_hrtf.txt

		echo "\n======================= 7. binaural out with HRTF files - SWB =======================\n\n"
		swb_modes=$(./scripts/runIvasCodec.py -l -C $modes_with_bin_out \| grep _swb_)
		hrtf_swb="../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin"
		./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $swb_modes $duration_arg -D="-hrtf ${hrtf_swb}" --decoder_only --oc $bin_out_modes \| tee -a smoke_test_output_hrtf.txt
		./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $swb_modes $duration_arg -D="-hrtf ${hrtf_swb}" --decoder_only --oc $bin_out_modes $timeout_cmd \| tee -a smoke_test_output_hrtf.txt

		echo "\n======================= 8. binaural out with HRTF files - FB =======================\n\n"
		fb_modes=$(./scripts/runIvasCodec.py -l -C $modes_with_bin_out \| grep _fb_)
		hrtf_fb="../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin"
		./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $fb_modes $duration_arg -D="-hrtf ${hrtf_fb}" --decoder_only --oc $bin_out_modes \| tee -a smoke_test_output_hrtf.txt
		./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $fb_modes $duration_arg -D="-hrtf ${hrtf_fb}" --decoder_only --oc $bin_out_modes $timeout_cmd \| tee -a smoke_test_output_hrtf.txt

lib_com/options.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -156,6 +156,8 @@
		#define FIX_INV_DIFFUSE_WEIGHT /* Orange : Fix error in energy compensation in late binaural reverb*/
		#define FIX_20_MS_FRAME_LEN_TABLES_CONVERTER /* Orange : generate_tables_converter tools can generate rom for 5 and 20 ms frame length */
		#define FIX_955_FASTCONV_REND_IN_ISM /* VA: put FastConv rendering call under DEBUGGING */
		#define FIX_969_USAN_IGF_ARITH /* FhG: issue 969: fix USAN error in igf_sce_dec; same issue as #962 */
		#define FIX_959_MASA_LINEAR_REND /* VA: issue 959: remove unused calling of ivas_sba_linear_renderer() in MASA rendering */

		/* #################### End BE switches ################################## */

		@@ -166,6 +168,7 @@
		#define NONBE_FIX_BINARY_BINAURAL_READING /* Orange: Add support for reading binaural binary file */
		#define NONBE_FIX_AVG_IAC_CLDFB_REVERB /* Orange: Add computation avg energy and iac tables for rom and binaural binary file */
		#define NONBE_FIX_935_EARLY_REFLECTIONS_WRONG_ORDER /* Qualcomm: issue 953: fix order or ER channels in LC mode*/
		#define NONBE_FIX_935_SBA_REVERB /* FhG: issue 935: fix MSAN error for SBA related to BINAURAL_ROOM_REVERB */
		#define NONBE_FIX_952_MC_PARAMUPMIX_5MS /* Dlb : issue 952 : Differences between 5ms and 20ms rendering for ParamUpmix*/
		#define NONBE_FIX_967_ISM_MONO_DMX /* FhG: issue 967: accumulating energies in ISM mono DMX */
		#define NONBE_FIX_968_ISM_BRIR_WITH_HEADROTATION_5MS_FIX /* FhG : issue #968: differences between 5ms and 20ms rendering for discrete ISM with BRIR and head rotation*/

lib_dec/igf_scf_dec.c

100644 → 100755

+10 −0

Original line number	Diff line number	Diff line
		@@ -211,7 +211,12 @@ static void decode_sfe_vector(
		\| c b
		\| e --> t
		*/
		#ifdef FIX_969_USAN_IGF_ARITH
		int16_t pred;
		uint16_t pred_tmp;
		#else
		uint16_t pred;
		#endif
		int16_t f, ctx, ctx_f, ctx_t;

		for ( f = 0; f < length; f++ )
		@@ -221,7 +226,12 @@ static void decode_sfe_vector(
		if ( f == 0 )
		{
		/* decode one of the IGF_SYMBOLS_IN_TABLE == 27 alphabet symbols using the new raw AC function */
		#ifdef FIX_969_USAN_IGF_ARITH
		ari_decode_14bits_s27_ext( st, &pred_tmp, &hPrivateData->acState, hPrivateData->cf_se00 );
		pred = (int16_t) pred_tmp;
		#else
		ari_decode_14bits_s27_ext( st, &pred, &hPrivateData->acState, hPrivateData->cf_se00 );
		#endif
		x[f] = pred << 2;
		x[f] += arith_decode_bits( &hPrivateData->acState, st, 2 ); /* LSBs as 2 bit raw */
		}