Merge branch 'main' into 908-decoder-crash-in-osba-foa-with-br-switching-due-to-bit-error-detection (2b6a5686) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+12 −7

Original line number	Diff line number	Diff line
		@@ -93,16 +93,19 @@ stages:
		# needed when depth is lower than the number of commits in the branch
		- git fetch origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME:$CI_MERGE_REQUEST_TARGET_BRANCH_NAME

		.mr-get-target-commit:
		&mr-get-target-commit # compare to last target branch commit before pipeline was created
		.mr-get-target-commit: &mr-get-target-commit # compare to last target branch commit before pipeline was created
		- target_commit=$(git log $CI_MERGE_REQUEST_TARGET_BRANCH_NAME -1 --oneline --before=${CI_PIPELINE_CREATED_AT} --format=%H)

		.check-for-testvectors:
		&check-for-testvectors # check if the testvector files specified in scripts/config/ci_linux*.json are present
		.check-for-testvectors: &check-for-testvectors # check if the testvector files specified in scripts/config/ci_linux*.json are present
		- 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
		.disable-debugging-macro: &disable-debugging-macro
		# automatically disable #DEBUGGING macro in options.h using /**/-comment
		- sed -i.bak -e "s/^[[:space:]]$#define[[:space:]]DEBUGGING$/\/\\1\\//g" lib_com/options.h

		.merge-request-comparison-setup-codec: &merge-request-comparison-setup-codec
		### build test binaries, initial clean for paranoia reasons
		- *disable-debugging-macro
		- make clean
		- mkdir build
		- cd build
		@@ -113,17 +116,18 @@ stages:
		- mv IVAS_rend ../IVAS_rend_test
		- cd ..
		- rm -rf build/*
		- git restore .

		### store the current commit hash
		- source_branch_commit_sha=$(git rev-parse HEAD)

		### checkout version to compare against
		- *mr-fetch-target-branch

		- *mr-get-target-commit
		- git checkout $target_commit

		### build reference binaries
		- *disable-debugging-macro
		- cd build
		- cmake ..
		- make -j
		@@ -131,6 +135,7 @@ stages:
		- mv IVAS_dec ../IVAS_dec_ref
		- mv IVAS_rend ../IVAS_rend_ref
		- cd ..
		- git restore .

		# rename test binaries back
		- mv IVAS_cod_test IVAS_cod

ci/smoke_test.sh

+2 −1

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"
		ep_file="ci/complexity_measurements/ep_10pct_fer.g192"

		if [ $BUILD -eq 1 ];then
		# Enable memory macros to find unbalanced memory allocations/deallocations
		@@ -88,7 +89,7 @@ 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
		# 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 -D="-fec 15" --decoder_only \| tee smoke_test_output_plc.txt
		./scripts/runIvasCodec.py $verbosity_cmd -p $cfg $duration_arg -f="$ep_file" --decoder_only \| tee smoke_test_output_plc.txt

		# run JBM modes - EXT is excluded as not supported yet
		# OMASA disabled for now

lib_com/options.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -155,6 +155,8 @@
		#define FIX_881_REMOVE_LFE_ADDITION_IN_ISM /* VA: issue 881: remove LFE addition in ISM format */
		#define FIX_887_ARRAY_SIZE_DFT_MDCT_STEREO /* VA: Fix the definition of buffers/arrays in DFT and MDCT stereo to satisfy gcc v 11.4.0 */
		#define FIX_891_PARAMUPMIX_CLEANUP /* Dlb: issue 891: remove unneeded code from ParamUpmix */
		#define FIX_917_LCLD_WARNINGS /* Dlb: issue 917 and 918: fix LCLD codec warnings*/
		#define FIX_920_IGF_INIT_ERROR /* FhG: issue 920: fix bitrate mismatch in initial IGF config to avoid error message in same cases */

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

		@@ -178,6 +180,7 @@
		#define NONBE_FIX_913_OMASA_BITBUDGET_VIOLATION /* VA/Nok: issue 913: Resolve "Crash in OMASA encoder - DFT-Stereo bit-budget violated" */
		#define NONBE_FIX_908_OSBA_BR_SWITCHING_CRASH /* FhG: issue 908: fix crash in OSBA BR switching with long test vectors */


		/* ##################### End NON-BE switches ########################### */

		/* ################## End DEVELOPMENT switches ######################### */

lib_com/prot.h

+4 −1

Original line number	Diff line number	Diff line
		@@ -6760,6 +6760,9 @@ float correlation_shift(
		void init_coder_ace_plus(
		Encoder_State st, / i : Encoder state handle */
		const int32_t last_total_brate, /* i : last total bitrate */
		#ifdef FIX_920_IGF_INIT_ERROR
		const int32_t igf_brate, /* i : IGF configuration bitrate */
		#endif
		const int16_t MCT_flag /* i : hMCT handle allocated (1) or not (0)*/
		);

lib_dec/ivas_jbm_dec.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1706,7 +1706,7 @@ ivas_error ivas_jbm_dec_flush_renderer(
		hTcBuffer->n_samples_buffered = hTcBuffer->n_samples_granularity + n_samples_still_available;
		hTcBuffer->n_samples_available = 0;
		hTcBuffer->n_samples_flushed = n_samples_to_render;
		#ifdef CR_FIX_JBM_FLUSH_OFFSET
		#ifdef NONBE_FIX_855_JBM_FLUSH_OFFSET
		hTcBuffer->n_samples_rendered = 0;
		#else
		hTcBuffer->n_samples_rendered = hTcBuffer->n_samples_granularity;
		@@ -1865,7 +1865,7 @@ ivas_error ivas_jbm_dec_flush_renderer(
		{
		return IVAS_ERROR( IVAS_ERR_WRONG_MODE, "Wrong IVAS format in VoIP renderer flushing!" );
		}
		#ifdef CR_FIX_JBM_FLUSH_OFFSET
		#ifdef NONBE_FIX_855_JBM_FLUSH_OFFSET
		hTcBuffer->n_samples_rendered = hTcBuffer->n_samples_granularity;
		#endif
		}