Merge remote-tracking branch 'forge/main' into isar-lc3plus-ble-48_6_compat (c9354fd1) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+51 −13

Original line number	Diff line number	Diff line
		@@ -167,6 +167,12 @@ stages:
		- git pull
		- cd -

		.update-ltv-repo-win: &update-ltv-repo-win
		- Push-Location
		- cd $LTV_DIR_WIN
		- git pull
		- Pop-Location

		.enable-split-rendering: &enable-split-rendering
		# automatically enable #define SPLIT_REND_WITH_HEAD_ROT in options.h, handling both /**/-comment and //-comment
		- sed -i.bak -e "s/\/\[[:space:]]$#define[[:space:]]SPLIT_REND_WITH_HEAD_ROT$[[:space:]]\*\//\1/g" ./lib_com/options.h
		@@ -189,6 +195,11 @@ stages:
		- cp "$LTV_DIR"/*.met scripts/testv/
		- cp "$LTV_DIR"/*.csv scripts/testv/

		.copy-ltv-files-to-testv-dir-win: &copy-ltv-files-to-testv-dir-win
		- cp $LTV_DIR_WIN\*.wav scripts\testv
		- cp $LTV_DIR_WIN\*.met scripts\testv
		- cp $LTV_DIR_WIN\*.csv scripts\testv

		.activate-Werror-linux: &activate-Werror-linux
		- sed -i.bak "s/^# $CFLAGS += -Werror$/\1/" Makefile
		- sed -i.bak "s/# $set(CMAKE_C_FLAGS \"\${CMAKE_C_FLAGS} -Werror\")$/\1/" CMakeLists.txt
		@@ -1360,7 +1371,7 @@ ivas-conformance:
		tags:
		- ivas-windows
		stage: test
		timeout: "60 minutes"
		timeout: "90 minutes"
		rules:
		- if: ($CI_PIPELINE_SOURCE == 'web' \|\| $CI_PIPELINE_SOURCE == 'trigger') && $MANUAL_PIPELINE_TYPE == 'ivas-conformance'
		- if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
		@@ -1378,9 +1389,8 @@ ivas-conformance:
		# Reference creation
		- python tests/create_short_testvectors.py
		- python scripts/prepare_combined_format_inputs.py
		- python -m pytest tests/codec_be_on_mr_nonselection -v -n auto --update_ref 1 -m create_ref --keep_files
		- python -m pytest tests/codec_be_on_mr_nonselection -v -n auto --update_ref 1 -m create_ref_part2 --keep_files
		- python -m pytest tests/renderer/test_renderer.py --create_ref --keep_files
		- python -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --update_ref 1 -m create_ref --create_ref --keep_files
		- python -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --update_ref 1 -m create_ref_part2 --keep_files

		# Output creation
		- python -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --keep_files --create_cut --html=report_cmd.html --self-contained-html
		@@ -1405,6 +1415,11 @@ ivas-conformance:
		- cp -r -force -ErrorAction Ignore tests/ref testvec/testv/ref
		- cp -r -force -ErrorAction Ignore tests/dut/* testvec/testv/ref
		- cp -r -force -ErrorAction Ignore tests/renderer/cut testvec/testv/renderer/ref

		# Remove redundant files
		- python scripts/cleanup_26252.py

		# Copy test script files
		- cp -r -force -ErrorAction Ignore tests/conformance-test testvec/
		- cp Readme_IVAS_dec.txt testvec
		- cp Readme_IVAS_enc.txt testvec
		@@ -1414,6 +1429,7 @@ ivas-conformance:
		- cp IVAS_dec.exe testvec/bin
		- cp IVAS_rend.exe testvec/bin


		# Test run generated scripts in testvec
		- cd testvec
		- python -m pytest conformance-test/test_26252.py --junit-xml=report-junit.xml --html=report.html --self-contained-html
		@@ -1439,7 +1455,7 @@ ivas-conformance-linux:
		tags:
		- ivas-linux
		stage: test
		timeout: "60 minutes"
		timeout: "90 minutes"
		rules:
		- if: ($CI_PIPELINE_SOURCE == 'web' \|\| $CI_PIPELINE_SOURCE == 'trigger') && $MANUAL_PIPELINE_TYPE == 'ivas-conformance-linux'
		allow_failure:
		@@ -1455,12 +1471,12 @@ ivas-conformance-linux:
		# Reference creation
		- python3 tests/create_short_testvectors.py
		- python3 scripts/prepare_combined_format_inputs.py
		- python3 -m pytest tests/codec_be_on_mr_nonselection -v -n auto --update_ref 1 -m create_ref --keep_files
		- python3 -m pytest tests/codec_be_on_mr_nonselection -v -n auto --update_ref 1 -m create_ref_part2 --keep_files
		- python3 -m pytest tests/renderer/test_renderer.py --create_ref --keep_files
		- TEST_SET="tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py"
		- python3 -m pytest $TEST_SET -v -n auto --update_ref 1 -m create_ref --create_ref --keep_files
		- python3 -m pytest $TEST_SET -v -n auto --update_ref 1 -m create_ref_part2 --keep_files

		# Output creation
		- python3 -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --keep_files --create_cut --html=report_cmd.html --self-contained-html
		- python3 -m pytest $TEST_SET -v -n auto --keep_files --create_cut --html=report_cmd.html --self-contained-html
		- python3 scripts/parse_commands.py report_cmd.html Readme_IVAS.txt

		# Copy input data and output ref data
		@@ -1478,32 +1494,54 @@ ivas-conformance-linux:
		- cp -r tests/ref testvec/testv/ref
		- cp -r tests/dut/* testvec/testv/ref
		- cp -r tests/renderer/cut testvec/testv/renderer/ref

		# Remove redundant files
		- python3 scripts/cleanup_26252.py

		# Copy test script files
		- cp -r tests/conformance-test testvec/
		- cp Readme_IVAS_dec.txt testvec
		- cp Readme_IVAS_enc.txt testvec
		- cp Readme_IVAS_rend.txt testvec
		- cp Readme_IVAS_JBM_dec.txt testvec

		# Create GCOV execs for coverage analysis
		- make clean
		- make GCOV=1 -j

		- cp IVAS_cod testvec/bin
		- cp IVAS_dec testvec/bin
		- cp IVAS_rend testvec/bin

		# Test run generated scripts in testvec
		- cd testvec
		- python3 -m pytest conformance-test/test_26252.py --junit-xml=report-junit.xml --html=report.html --self-contained-html
		- exit_code=0
		- python3 -m pytest conformance-test/test_26252.py --junit-xml=report-junit.xml --html=report.html --self-contained-html \|\| exit_code=$?
		- mv report.html ..
		- mv report-junit.xml ..

		# Collect coverage
		- cd -
		- lcov -c -d obj -o coverage.info
		- lcov -r coverage.info "apps" -o coverage.info
		- lcov -r coverage.info "lib_util" -o coverage.info
		- commit_sha=$(git rev-parse HEAD)
		- genhtml coverage.info -o coverage -t "Coverage on main @ $commit_sha"

		artifacts:
		name: "ivas-conformance-linux-$CI_COMMIT_SHORT_SHA"
		expire_in: 1 week
		when: always
		paths:
		- report_cmd.html
		- report-junit.xml
		- report.html
		- Readme_IVAS_dec.txt
		- Readme_IVAS_enc.txt
		- Readme_IVAS_rend.txt
		- Readme_IVAS_JBM_dec.txt
		- coverage.info
		- coverage
		expose_as: "Draft IVAS conformance -- Linux"
		reports:
		junit: report-junit.xml

apps/decoder.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -660,7 +660,13 @@ int main(
		fprintf( stderr, "Failed to get directivity patterns for one or more of IDs: %d %d %d %d\n\n", arg.directivityPatternId[0], arg.directivityPatternId[1], arg.directivityPatternId[2], arg.directivityPatternId[3] );
		goto cleanup;
		}

		#ifdef CONF_DISTATT
		if ( ( error = RenderConfigReader_getDistanceAttenuation( renderConfigReader, renderConfig.distAtt ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Failed to get Distance Attenuation \n\n" );
		goto cleanup;
		}
		#endif
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		if ( ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\|
		arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )

lib_com/common_api_types.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -335,6 +335,9 @@ typedef struct _IVAS_RENDER_CONFIG
		ISAR_SPLIT_REND_CONFIG_DATA split_rend_config;
		#endif
		float directivity[IVAS_MAX_NUM_OBJECTS * 3];
		#ifdef CONF_DISTATT
		float distAtt[3];
		#endif

		} IVAS_RENDER_CONFIG_DATA, *IVAS_RENDER_CONFIG_HANDLE;

lib_com/ivas_prot.h

+18 −2

Original line number	Diff line number	Diff line
		@@ -3207,6 +3207,9 @@ void ivas_qmetadata_enc_sid_encode(
		BSTR_ENC_HANDLE hMetaData, /* i/o: metadata bitstream handle */
		IVAS_QMETADATA q_metadata, / i/o: metadata handle */
		const int16_t masa_sid_descriptor, /* i : description of MASA SID coding structure*/
		#ifdef NONBE_FIX_1052_SBA_EXT
		const int16_t nchan_transport, /* i : number of transport channels */
		#endif
		const int16_t ivas_format /* i : ivas format */
		);

		@@ -3515,6 +3518,13 @@ int16_t ivas_sba_get_nchan_metadata(
		const int32_t ivas_total_brate /* i : IVAS total bitrate */
		);

		#ifdef NONBE_FIX_1052_SBA_EXT
		/! r: number of bits in SPAR SID frame /
		int16_t ivas_sba_spar_sid_bitlen(
		const int16_t nchan_transport /* i : number of transport channels */
		);
		#endif

		void ivas_sba_get_spar_hoa_ch_ind(
		const int16_t num_md_chs, /* i : number of MD channels */
		const int32_t ivas_total_brate, /* i : IVAS total bitrate */
		@@ -3616,6 +3626,9 @@ ivas_error ivas_dirac_enc(
		const int16_t input_frame, /* i : input frame length */
		const int16_t dtx_vad, /* i : DTX vad flag */
		const IVAS_FORMAT ivas_format, /* i : ivas format */
		#ifdef NONBE_FIX_1052_SBA_EXT
		const int16_t nchan_transport, /* i : number of transport channels */
		#endif
		const int16_t hodirac_flag /* i : hodirac flag */
		);

		@@ -3671,6 +3684,9 @@ void ivas_dirac_dec_read_BS(
		int16_t nb_bits, / o : number of bits read */
		const int16_t last_bit_pos, /* i : last read bitstream position */
		const int16_t hodirac_flag, /* i : flag to indicate HO-DirAC mode */
		#ifdef NONBE_FIX_1052_SBA_EXT
		const int16_t nchan_transport, /* i : number of transport channels */
		#endif
		int16_t dirac_to_spar_md_bands / o : DirAC->SPAR MD bands */
		);

lib_com/ivas_sba_config.c

+23 −0

Original line number	Diff line number	Diff line
		@@ -158,6 +158,29 @@ int16_t ivas_sba_get_nchan(
		return ( nb_channels );
		}

		#ifdef NONBE_FIX_1052_SBA_EXT
		/-------------------------------------------------------------------
		* ivas_sba_spar_sid_bitlen()
		*
		* Get number of bits in SPAR SID frame
		-------------------------------------------------------------------/

		/! r: number of bits in SPAR SID frame /
		int16_t ivas_sba_spar_sid_bitlen(
		const int16_t nchan_transport /* i : number of transport channels */
		)
		{
		int16_t num_bits;

		num_bits = SPAR_DTX_BANDS * SPAR_SID_BITS_TAR_PER_BAND;
		if ( nchan_transport > 1 )
		{
		num_bits -= 2;
		}

		return num_bits;
		}
		#endif

		/-------------------------------------------------------------------
		* ivas_sba_get_nchan_metadata()