Merge branch 'main' to 'philips/contribution-38-control-metadata-reverb' (a31c52ce) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+44 −4

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
		@@ -282,10 +283,10 @@ build-codec-sanitizers-linux:
		- *print-common-info
		- bash ci/build_codec_sanitizers_linux.sh

		.build-codec-windows-cmake:
		build-codec-windows-cmake:
		extends:
		- .build-job-windows-with-check-for-warnings
		- .rules-basis
		- .rules-main-push
		script:
		- *print-common-info-windows
		- $winoutdata = $null
		@@ -295,10 +296,10 @@ build-codec-sanitizers-linux:
		- ("& python ci/check_for_warnings.py '$BUILD_OUTPUT'") \| Invoke-Expression
		- ("exit $LASTEXITCODE") \| Invoke-Expression

		.build-codec-windows-msbuild:
		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
		# ---------------------------------------------------------------

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

Original line number	Diff line number	Diff line
		@@ -447,9 +447,6 @@ enum
		IND_STEREO_2ND_CODER_T,

		IND_UNUSED,
		#ifndef IND_LIST_DYN
		MAX_NUM_INDICES = IND_UNUSED + 772 /* Total 2640 in line with MAX_BITS_METADATA */
		#endif
		};

		/----------------------------------------------------------------------------------

lib_com/ivas_cnst.h

+0 −16

Original line number	Diff line number	Diff line
		@@ -181,15 +181,10 @@ typedef enum
		#define MAX_CPE ( MAX_TRANSPORT_CHANNELS / CPE_CHANNELS ) /* max. number of CPEs */

		#define MAX_BITS_METADATA 2640 /* max. bit-budget of metadata, one channel / / IVAS_fmToDo: to be confirmed for final value once mature */
		#ifndef IND_LIST_DYN
		#define MAX_NUM_METADATA max( 2, MAX_NUM_OBJECTS ) /* number of max. metadata (now only 2 for DirAC) */
		#endif
		#ifdef IND_LIST_DYN
		#define MIN_NUM_IND 10 /* minimum number of indices in the core coder */
		#define MAX_NUM_IND_LFE 100 /* maximum number of indices in the LFE encoder */
		#define MAX_NUM_IND_TEMP_LIST 10 /* maximum number of indices in the temporary list */
		#define MAX_IND_TDM_TMP 10 /* maximum number of indices in the temporary list of TD stereo spatial parameters */
		#endif

		#define IVAS_ENC_DELAY_NS ACELP_LOOK_NS
		#define IVAS_DEC_DELAY_NS 3250000L /* 3.25 ms: IVAS decoder delay (without renderer delay) */
		@@ -335,12 +330,8 @@ typedef enum

		#define ISM_NB_BITS_METADATA_NOMINAL ( ( SCE_CORE_16k_LOW_LIMIT - ACELP_16k_LOW_LIMIT ) / FRAMES_PER_SEC ) /* nominal number of metadata bits - used for configuration of Core-Coder modules */

		#ifdef FIX_532_ISM_MD_INACTIVE
		#define ISM_METADATA_MD_FLAG_BITS 1 /* flag to distinguish between NULL metadata and low-rate ISM_NO_META class */
		#define ISM_METADATA_INACTIVE_FLAG_BITS 1 /* flag to signal whether MD are sent in low-rate inactive frame */
		#else
		#define ISM_METADATA_VAD_FLAG_BITS 1
		#endif
		#define ISM_METADATA_FLAG_BITS 2

		#define ISM_NO_META 0
		@@ -394,9 +385,7 @@ typedef enum
		#define ISM_Q_STEP_LOW (ISM_Q_STEP * 2)
		#define ISM_Q_STEP_BORDER_LOW (ISM_Q_STEP_BORDER * 2)

		#ifdef FIX_532_ISM_MD_INACTIVE
		#define BRATE_ISM_INACTIVE 2450 /* CoreCoder bitrate in ISM inactive frames */
		#endif

		typedef enum
		{
		@@ -413,14 +402,9 @@ enum
		IND_ISM_EXTENDED_FLAG = IND_ISM_NUM_OBJECTS + MAX_NUM_OBJECTS,
		IND_ISM_EXTENDED_NDP_FLAG,
		IND_ISM_METADATA_FLAG,
		#ifdef FIX_532_ISM_MD_INACTIVE
		IND_ISM_MD_NULL_FLAG = IND_ISM_METADATA_FLAG + MAX_NUM_OBJECTS,
		IND_ISM_MD_INACTIVE_FLAG = IND_ISM_MD_NULL_FLAG + MAX_NUM_OBJECTS,
		IND_ISM_NOISY_SPEECH_FLAG = IND_ISM_MD_INACTIVE_FLAG + MAX_NUM_OBJECTS,
		#else
		IND_ISM_VAD_FLAG = IND_ISM_METADATA_FLAG + MAX_NUM_OBJECTS,
		IND_ISM_NOISY_SPEECH_FLAG = IND_ISM_VAD_FLAG + MAX_NUM_OBJECTS,
		#endif
		IND_ISM_SCE_ID_DTX,
		IND_ISM_DTX_COH_SCA,

lib_com/ivas_fb_mixer.c

+0 −3

File changed.

Preview size limit exceeded, changes collapsed.