Merge branch 'main' into 471-integrate-the-multichannel-parametric-upmix-into-the-jbm-path (588c8b29) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+43 −3

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@ variables:
		OUT_FORMATS_BINAURAL: "BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB"
		EXIT_CODE_NON_BE: 123
		EXIT_CODE_FAIL: 1
		PROCESSING_SCRIPTS_BIN_DIR: "/test-bin"

		default:
		interruptible: true # Make all jobs by default interruptible
		@@ -71,7 +72,7 @@ stages:

		.check-for-testvectors: &check-for-testvectors
		# check if the testvector files specified in scripts/config/ci_linux*.json are present
		- python3 -m pytest tests/ci/test_vectors_available.py
		- python3 -m pytest ci/test_vectors_available.py

		.merge-request-comparison-setup-codec:
		&merge-request-comparison-setup-codec ### build test binaries, initial clean for paranoia reasons
		@@ -285,7 +286,7 @@ build-codec-sanitizers-linux:
		build-codec-windows-cmake:
		extends:
		- .build-job-windows-with-check-for-warnings
		- .rules-basis
		- .rules-main-push
		script:
		- *print-common-info-windows
		- $winoutdata = $null
		@@ -298,7 +299,7 @@ build-codec-windows-cmake:
		build-codec-windows-msbuild:
		extends:
		- .build-job-windows-with-check-for-warnings
		- .rules-basis
		- .rules-main-push
		script:
		- *print-common-info-windows
		- $winoutdata = $null
		@@ -692,6 +693,45 @@ check-first-frame-is-sid:
		expose_as: "logs-sidstart"
		expire_in: "5 days"

		selection-test-processing:
		extends:
		- .test-job-linux-needs-testv-dir
		- .rules-merge-request
		tags:
		- processing-scripts-linux
		stage: test
		needs: ["build-codec-linux-make"]
		script:
		# get processing script code
		- git clone https://forge.3gpp.org/rep/ivas-codec-pc/ivas-processing-scripts.git --single-branch -b main

		- mkdir -p ivas-processing-scripts/tests/data/testv
		- cp -r scripts/testv/* ivas-processing-scripts/tests/data/testv/

		# copy binaries into local bin dir, those should take precendence over PATH
		- cp $PROCESSING_SCRIPTS_BIN_DIR/* ivas-processing-scripts/ivas_processing_scripts/bin/
		# for testing with native binaries
		- rm ivas-processing-scripts/ivas_processing_scripts/bin/IVAS*.exe
		- rm ivas-processing-scripts/ivas_processing_scripts/bin/EVS*.exe

		# build codec and put into bin dir
		- make -j
		- cp ./IVAS_* ivas-processing-scripts/ivas_processing_scripts/bin/

		# patch the use_windows_codec_binaries key (weird folding is needed so colons are accepted)
		- >
		sed -i "s/use_windows_codec_binaries: true/use_windows_codec_binaries: false/" ivas-processing-scripts/experiments/selection//config/.yml

		# run experiments test
		- cd ivas-processing-scripts
		- python3 -m pytest tests/test_experiments.py::test_generate_test_items -n auto \| tee log.txt
		artifacts:
		paths:
		- ivas-processing-scripts/experiments/selection//proc_output/.log
		- log.txt
		when: on_failure
		expire_in: 1 week

		# ---------------------------------------------------------------
		# Test jobs for main branch
		# ---------------------------------------------------------------

apps/decoder.c

+20 −0

Original line number	Diff line number	Diff line
		@@ -1580,7 +1580,11 @@ static ivas_error initOnFirstGoodFrame(

		/* Duplicate good first frame metadata to fill the beginning of stream. */
		MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta = NULL;
		#ifdef FIX_470_MASA_JBM_EXT
		if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta, 0 ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "\nError in IVAS_DEC_GetMasaMetadata: %s\n", IVAS_DEC_GetErrorMessage( error ) );
		return error;
		@@ -1878,7 +1882,11 @@ static ivas_error decodeG192(
		else if ( bsFormat == IVAS_DEC_BS_MASA )
		{
		MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta;
		#ifdef FIX_470_MASA_JBM_EXT
		if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta, 0 ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "\nError in IVAS_DEC_GetMasaMetadata: %s\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		@@ -2426,7 +2434,11 @@ static ivas_error decodeVoIP(
		else if ( bsFormat == IVAS_DEC_BS_MASA )
		{
		MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta;
		#ifdef FIX_470_MASA_JBM_EXT
		if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta, 1 ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "\nError in IVAS_DEC_GetMasaMetadata: %s\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		@@ -2838,7 +2850,11 @@ static ivas_error decodeVariableSpeed(
		else if ( bsFormat == IVAS_DEC_BS_MASA )
		{
		MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta;
		#ifdef FIX_470_MASA_JBM_EXT
		if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta, 1 ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "\nError in IVAS_DEC_GetMasaMetadata: %s\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		@@ -3008,7 +3024,11 @@ static ivas_error decodeVariableSpeed(
		else if ( bsFormat == IVAS_DEC_BS_MASA )
		{
		MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta;
		#ifdef FIX_470_MASA_JBM_EXT
		if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta, 0 ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "\nError in IVAS_DEC_GetMasaMetadata: %s\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;

tests/ci/test_vectors_available.py→ci/test_vectors_available.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@ import pathlib
		import json
		import itertools

		TEST_CONFIG_DIR = pathlib.Path(__file__).parent.parent.parent.joinpath("scripts/config")
		TEST_CONFIG_DIR = pathlib.Path(__file__).parent.parent.joinpath("scripts/config")
		TEST_CONFIGS = [f for f in TEST_CONFIG_DIR.iterdir() if f.name.startswith("ci_linux")]

		def get_testvectors_from_config(config) -> list:

lib_com/bitstream.c

100755 → 100644

+4 −329

File changed.File mode changed from 100755 to 100644.

Preview size limit exceeded, changes collapsed.

lib_com/cnst.h

+0 −3

File changed.

Preview size limit exceeded, changes collapsed.