Merge with main (7c2d1ead) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitignore

+2 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,8 @@ scripts/ref/
		scripts/test/
		scripts/out/
		scripts/self_test_summary.txt
		scripts/cppp/
		binary/
		tests/renderer/cut
		tests/renderer/ref
		tests/dut

.gitlab-ci.yml

+19 −45

Original line number	Diff line number	Diff line
		@@ -147,7 +147,7 @@ stages:

		.build-job-linux:
		stage: build
		timeout: "2 minutes"
		timeout: "4 minutes"
		tags:
		- ivas-linux

		@@ -270,12 +270,14 @@ codec-smoke-test:
		### analyze for failures
		- if cat smoke_test_output.txt \| grep -c "failed"; then echo "Smoke test without PLC failed"; exit 1; fi
		- if cat smoke_test_output_plc.txt \| grep -c "failed"; then echo "Smoke test with PLC failed"; exit 1; fi
		- if cat smoke_test_output_jbm_noEXT.txt \| grep -c "failed"; then echo "Smoke test with PLC failed"; exit 1; fi
		artifacts:
		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"
		paths:
		- out/logs/
		- smoke_test_output.txt
		- smoke_test_output_plc.txt
		- smoke_test_output_jbm_noEXT.txt
		expose_as: "Smoke test results"

		# code selftest testvectors with memory-sanitizer binaries
		@@ -562,6 +564,17 @@ evs-pytest-on-merge-request:
		junit:
		- report-junit-evs.xml

		voip-be-on-merge-request:
		extends:
		- .test-job-linux-needs-testv-dir
		- .rules-merge-request
		stage: compare # Or should it be test? Comparison is done within one git revision
		needs: ["build-codec-linux-make", codec-smoke-test]
		timeout: "10 minutes"
		script:
		- *print-common-info
		- bash ci/ivas_voip_be_test.sh

		clang-format-check:
		extends:
		- .test-job-linux
		@@ -915,10 +928,14 @@ coverage-test-on-main-scheduled:
		script:
		- *print-common-info
		- make GCOV=1 -j
		- cp IVAS_rend IVAS_rend_ref # Copy exec to be able to run external renderer script
		- python3 tests/create_short_testvectors.py
		- python3 -m pytest tests -v -n 0 --update_ref 1 -m create_ref --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec
		- python3 -m pytest tests -v -n 0 --update_ref 1 -m create_ref_part2 --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec
		- python3 -m pytest tests/test_param_file.py -v -n 0 --update_ref 1 -m create_ref --param_file scripts/config/self_test_evs.prm --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec
		- bash ci/smoke_test.sh coverage
		- python3 -m pytest -q -n auto tests/renderer/test_renderer_be_comparison.py
		- bash ci/ivas_voip_be_test.sh coverage
		- lcov -c -d obj -o coverage.info
		- genhtml coverage.info -o coverage
		artifacts:
		@@ -1081,57 +1098,14 @@ complexity-StereoDmxEVS-stereo-in-mono-out:
		# ---------------------------------------------------------------

		# job that sets up gitlab pages website
		# is run on a separate schedule and collects artifacts from other jobs (currently
		# only the complexity measurements) multiple times a day
		pages:
		stage: deploy
		tags:
		- ivas-linux
		rules:
		- if: $UPDATE_PAGES
		# TODO: add coverage job
		script:

		- API_URL_BASE=https://forge.3gpp.org/rep/api/v4/projects/$CI_PROJECT_ID/jobs
		- branch=$CI_COMMIT_REF_NAME

		- mkdir public

		### fetch artifacts from latest run of complexity jobs
		- job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch complexity-stereo-in-stereo-out)
		- echo $job_id
		- echo "$API_URL_BASE/$job_id/artifacts"
		- curl --request GET "$API_URL_BASE/$job_id/artifacts" --output artifacts_comp_stereo.zip
		- cat artifacts_comp_stereo.zip
		- unzip -o artifacts_comp_stereo.zip
		- mv complexity-stereo-in-stereo-out-public ./public/

		- job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch complexity-ism-in-binaural-out)
		- curl --request GET "$API_URL_BASE/$job_id/artifacts" --output artifacts_comp_ism.zip
		- unzip -o artifacts_comp_ism.zip
		- mv complexity-ism-in-binaural-out-public ./public/

		- job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch complexity-sba-hoa3-in-hoa3-out)
		- curl --request GET "$API_URL_BASE/$job_id/artifacts" --output artifacts_comp_sba.zip
		- unzip -o artifacts_comp_sba.zip
		- mv complexity-sba-hoa3-in-hoa3-out-public ./public/

		- job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch complexity-mc-in-7_1_4-out)
		- curl --request GET "$API_URL_BASE/$job_id/artifacts" --output artifacts_comp_mc.zip
		- unzip -o artifacts_comp_mc.zip
		- mv complexity-mc-in-7_1_4-out-public ./public/

		- job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch complexity-masa-in-7_1_4-out)
		- curl --request GET "$API_URL_BASE/$job_id/artifacts" --output artifacts_comp_masa.zip
		- unzip -o artifacts_comp_masa.zip
		- mv complexity-masa-in-7_1_4-out-public ./public/

		- job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch complexity-StereoDmxEVS-stereo-in-mono-out)
		- curl --request GET "$API_URL_BASE/$job_id/artifacts" --output artifacts_comp_StereoDmxEVS.zip
		- unzip -o artifacts_comp_StereoDmxEVS.zip
		- mv complexity-StereoDmxEVS-stereo-in-mono-out-public ./public/

		- cp ci/index-pages.html public/index.html
		- python3 ci/setup_pages.py
		artifacts:
		paths:
		- public

CMakeLists.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -187,3 +187,6 @@ if(COPY_EXECUTABLES_FROM_BUILD_DIR)
		add_custom_command(TARGET IVAS_crend_unit_test POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:IVAS_crend_unit_test>" "${CMAKE_CURRENT_SOURCE_DIR}/scripts/ivas_pytests/tests/unit_tests/crend/")
		add_custom_command(TARGET renderer_standalone POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:renderer_standalone>" "${CMAKE_CURRENT_SOURCE_DIR}/scripts/td_object_renderer/object_renderer_standalone/")
		endif()

		# Allow creating packages for CMake install
		install(TARGETS lib_enc lib_dec lib_rend lib_com lib_util ARCHIVE DESTINATION lib)

Workspace_msvc/lib_debug.vcxproj

+3 −7

Original line number	Diff line number	Diff line
		@@ -143,20 +143,16 @@
		</ItemDefinitionGroup>
		<ItemGroup>
		<ClCompile Include="..\lib_debug\debug.c" />
		<ClCompile Include="..\lib_debug\memory.c" />
		<ClCompile Include="..\lib_debug\mem_count.c" />
		<ClCompile Include="..\lib_debug\segsnr.c" />
		<ClCompile Include="..\lib_debug\snr.c" />
		<ClCompile Include="..\lib_debug\sba_debug.c" />
		<ClCompile Include="..\lib_debug\wmops.c" />
		<ClCompile Include="..\lib_debug\wmc_auto.c" />
		</ItemGroup>
		<ItemGroup>
		<ClInclude Include="..\lib_debug\debug.h" />
		<ClInclude Include="..\lib_debug\deb_out.h" />
		<ClInclude Include="..\lib_debug\errorhnd.h" />
		<ClInclude Include="..\lib_debug\mem_count.h" />
		<ClInclude Include="..\lib_debug\sba_debug.h" />
		<ClInclude Include="..\lib_debug\wmops.h" />
		<ClInclude Include="..\lib_debug\wmc_auto.h" />
		</ItemGroup>
		<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
		<ImportGroup Label="ExtensionTargets">

Workspace_msvc/lib_dec.vcxproj

+1 −0

Original line number	Diff line number	Diff line
		@@ -283,6 +283,7 @@
		<ClCompile Include="..\lib_dec\ivas_lfe_dec.c" />
		<ClCompile Include="..\lib_dec\ivas_lfe_plc.c" />
		<ClCompile Include="..\lib_dec\ivas_masa_dec.c" />
		<ClCompile Include="..\lib_dec\ivas_mcmasa_dec.c" />
		<ClCompile Include="..\lib_dec\ivas_mct_core_dec.c" />
		<ClCompile Include="..\lib_dec\ivas_mct_dec.c" />
		<ClCompile Include="..\lib_dec\ivas_mct_dec_mct.c" />