Merge remote-tracking branch 'remotes/origin/main' into... (57da011b) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitignore

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -47,6 +47,10 @@ tests/**/[c\|d]ut
	tests/**/ref		tests/**/ref
	tests/*/testv		tests/*/testv
	scripts/testv/_cut.pcm		scripts/testv/_cut.pcm
			scripts/testv/stvOMASA_*.met
			scripts/testv/stvOMASA_*.csv
			scripts/testv/stvOMASA_2ISM_1MASA1TC48c.wav
			scripts/testv/stvOMASA_3ISM_1MASA1TC48c.wav
	# default reference binary name		# default reference binary name
	IVAS_cod_ref		IVAS_cod_ref
	IVAS_dec_ref		IVAS_dec_ref

.gitlab-ci.yml

+20 −8

Original line number	Original line	Diff line number	Diff line
	@@ -517,7 +517,9 @@ renderer-pytest-on-merge-request:
	- *print-common-info		- *print-common-info

	# some helper variables - "\|\| true" to prevent failures from grep not finding anything		# some helper variables - "\|\| true" to prevent failures from grep not finding anything
	- non_be_flag=$(echo $CI_MERGE_REQUEST_TITLE \| grep -c --ignore-case "\[rend$erer$[ -]non[ -]*be\]") \|\| true		# write to temporary file as workaround for failures observed with piping echo
			- echo $CI_MERGE_REQUEST_TITLE > tmp.txt
			- non_be_flag=$(grep -c --ignore-case "\[rend$erer$[ -]non[ -]*be\]" tmp.txt) \|\| true
	# TODO: needs splitting the test between reference and cut generation		# TODO: needs splitting the test between reference and cut generation
	#- ref_using_main=$(echo $CI_MERGE_REQUEST_TITLE \| grep -c --ignore-case "\[ref[ -]using[ -]main\]") \|\| true		#- ref_using_main=$(echo $CI_MERGE_REQUEST_TITLE \| grep -c --ignore-case "\[ref[ -]using[ -]main\]") \|\| true

	@@ -593,7 +595,9 @@ split-rendering-pytest-on-merge-request:
	- *print-common-info		- *print-common-info

	# some helper variables - "\|\| true" to prevent failures from grep not finding anything		# some helper variables - "\|\| true" to prevent failures from grep not finding anything
	- non_be_flag=$(echo $CI_MERGE_REQUEST_TITLE \| grep -c --ignore-case "\[split[ -]non[ -]*be\]") \|\| true		# write to temporary file as workaround for failures observed with piping echo
			- echo $CI_MERGE_REQUEST_TITLE > tmp.txt
			- non_be_flag=$(grep -c --ignore-case "\[split[ -]non[ -]*be\]" tmp.txt) \|\| true
	# TODO: needs splitting the test between reference and cut generation		# TODO: needs splitting the test between reference and cut generation
	#- ref_using_main=$(echo $CI_MERGE_REQUEST_TITLE \| grep -c --ignore-case "\[ref[ -]using[ -]main\]") \|\| true		#- ref_using_main=$(echo $CI_MERGE_REQUEST_TITLE \| grep -c --ignore-case "\[ref[ -]using[ -]main\]") \|\| true

	@@ -650,8 +654,10 @@ ivas-pytest-on-merge-request:
	- *merge-request-comparison-setup-codec		- *merge-request-comparison-setup-codec

	# some helper variables - "\|\| true" to prevent failures from grep not finding anything		# some helper variables - "\|\| true" to prevent failures from grep not finding anything
	- non_be_flag=$(echo $CI_MERGE_REQUEST_TITLE \| grep -c --ignore-case "\[non[ -]*be\]") \|\| true		# write to temporary file as workaround for failures observed with piping echo
	- ref_using_main=$(echo $CI_MERGE_REQUEST_TITLE \| grep -c --ignore-case "\[ref[ -]using[ -]main\]") \|\| true		- echo $CI_MERGE_REQUEST_TITLE > tmp.txt
			- non_be_flag=$(grep -c --ignore-case "\[non[ -]*be\]" tmp.txt) \|\| true
			- ref_using_main=$(grep -c --ignore-case "\[ref[ -]using[ -]main\]" tmp.txt) \|\| true

	### If ref_using_main is not set, checkoug the source branch to use scripts and input from there		### If ref_using_main is not set, checkoug the source branch to use scripts and input from there
	- if [ $ref_using_main == 0 ]; then git checkout $source_branch_commit_sha; fi		- if [ $ref_using_main == 0 ]; then git checkout $source_branch_commit_sha; fi
	@@ -700,8 +706,10 @@ evs-pytest-on-merge-request:
	- *merge-request-comparison-setup-codec		- *merge-request-comparison-setup-codec

	# some helper variables - "\|\| true" to prevent failures from grep not finding anything		# some helper variables - "\|\| true" to prevent failures from grep not finding anything
	- non_be_flag=$(echo $CI_MERGE_REQUEST_TITLE \| grep -c --ignore-case "\[evs[ -]non[ -]be\]") \|\| true		# write to temporary file as workaround for failures observed with piping echo
	- ref_using_main=$(echo $CI_MERGE_REQUEST_TITLE \| grep -c --ignore-case "\[ref[ -]using[ -]main\]") \|\| true		- echo $CI_MERGE_REQUEST_TITLE > tmp.txt
			- non_be_flag=$(grep -c --ignore-case "\[evs[ -]non[ -]be\]" tmp.txt) \|\| true
			- ref_using_main=$(grep -c --ignore-case "\[ref[ -]using[ -]main\]" tmp.txt) \|\| true

	### If ref_using_main is not set, checkoug the source branch to use scripts and input from there		### If ref_using_main is not set, checkoug the source branch to use scripts and input from there
	- if [ $ref_using_main == 0 ]; then git checkout $source_branch_commit_sha; fi		- if [ $ref_using_main == 0 ]; then git checkout $source_branch_commit_sha; fi
	@@ -803,6 +811,8 @@ check-first-frame-is-sid:
	script:		script:
	- *print-common-info		- *print-common-info
	- *update-ltv-repo		- *update-ltv-repo
			# Temporary fix to test only SID start config files in this job
			- rm scripts/config/ci_linux_ltv.json scripts/config/ci_linux.json
	- *check-for-testvectors		- *check-for-testvectors
	- cmake .		- cmake .
	- make -j		- make -j
	@@ -972,8 +982,10 @@ codec-comparison-on-main-push:
	- cd ..		- cd ..

	# helper variable - "\|\| true" to prevent failures from grep not finding anything		# helper variable - "\|\| true" to prevent failures from grep not finding anything
	- non_be_flag=$(echo $CI_COMMIT_MESSAGE \| grep -c --ignore-case "\[non[ -]*be\]") \|\| true		# write to temporary file as workaround for failures observed with piping echo
	- ref_using_main=$(echo $CI_COMMIT_MESSAGE \| grep -c --ignore-case "\[ref[ -]using[ -]main\]") \|\| true		- echo $CI_COMMIT_MESSAGE > tmp.txt
			- non_be_flag=$(grep -c --ignore-case "\[non[ -]*be\]" tmp.txt) \|\| true
			- ref_using_main=$(grep -c --ignore-case "\[ref[ -]using[ -]main\]" tmp.txt) \|\| true

	### re-checkout the latest commit in the main branch, if ref_using_main is not set		### re-checkout the latest commit in the main branch, if ref_using_main is not set
	- if [ $ref_using_main == 0 ]; then git checkout $latest_commit;fi		- if [ $ref_using_main == 0 ]; then git checkout $latest_commit;fi

ci/smoke_test.sh

+9 −4

lib_com/options.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -217,6 +217,8 @@
	#define FIX_613_DIRAC_NULL_PTR_USAN /* Nokia: Issue #613: USAN in DirAC decoder setup */		#define FIX_613_DIRAC_NULL_PTR_USAN /* Nokia: Issue #613: USAN in DirAC decoder setup */

	#define MASA_AND_OBJECTS /* Nokia: Combination of MASA and objects */		#define MASA_AND_OBJECTS /* Nokia: Combination of MASA and objects */
			#define FIX_653_BUG_IN_SKIP_MATRIX /* Dlb: fix for issue #653, bug in the ivas_spar_get_skip_mat function*/
			#define FIX_663_PARAM_ISM_EXT /* FhG: Issue 663: ParamISM EXT output improvement */
	#define FIX_264_AUDIO_CHANNELS_TO_HEAP /* VA: issue 243: Move audio channels memory from stack to heap */		#define FIX_264_AUDIO_CHANNELS_TO_HEAP /* VA: issue 243: Move audio channels memory from stack to heap */

lib_dec/ivas_binRenderer_internal.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1085,6 +1085,7 @@ ivas_error ivas_rend_openCldfbRend(
	hBinRenderer->conv_band = convBand;		hBinRenderer->conv_band = convBand;
	}		}
	hBinRenderer->hInputSetup->is_loudspeaker_setup = 0;		hBinRenderer->hInputSetup->is_loudspeaker_setup = 0;
			hBinRenderer->hInputSetup->output_config = in_config;
	getAudioConfigNumChannels( inConfig, &hBinRenderer->hInputSetup->nchan_out_woLFE );		getAudioConfigNumChannels( inConfig, &hBinRenderer->hInputSetup->nchan_out_woLFE );

	if ( ( out_config == AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) \|\| ( out_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )		if ( ( out_config == AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) \|\| ( out_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )

Original line number	Original line	Diff line number	Diff line
	@@ -75,10 +75,14 @@ if [ $BUILD -eq 1 ];then

	fi		fi

			# prepare combined format test signals
			echo "\n======================= 0. preparing combined format test inputs =======================\n\n"
			./scripts/prepare_combined_format_inputs.py

	# run all modes vanilla-fashion		# run all modes vanilla-fashion
	# treat ISM modes separately because passing the metadata files to MASA modes causes crashes		# treat ISM modes separately because passing the metadata files to MASA modes causes crashes
	ism_modes=$(./scripts/runIvasCodec.py -l \| grep ISM)		ism_modes=$(./scripts/runIvasCodec.py -l \| grep ^ISM)
	non_ism_modes=$(./scripts/runIvasCodec.py -l \| grep -v ISM)		non_ism_modes=$(./scripts/runIvasCodec.py -l \| grep -v ^ISM)
	echo "\n======================= 1. non-ism modes no FEC =======================\n\n"		echo "\n======================= 1. non-ism modes no FEC =======================\n\n"
	./scripts/runIvasCodec.py -m $non_ism_modes -p $cfg $duration_arg $WORKERS \| tee smoke_test_output.txt		./scripts/runIvasCodec.py -m $non_ism_modes -p $cfg $duration_arg $WORKERS \| tee smoke_test_output.txt
	echo "\n======================= 2. ism modes no FEC =======================\n\n"		echo "\n======================= 2. ism modes no FEC =======================\n\n"
	@@ -88,8 +92,9 @@ echo "\n======================= 3. all modes with FEC =======================\n\
	./scripts/runIvasCodec.py -p $cfg $duration_arg $WORKERS -D="-fec 15" --decoder_only \| tee smoke_test_output_plc.txt		./scripts/runIvasCodec.py -p $cfg $duration_arg $WORKERS -D="-fec 15" --decoder_only \| tee smoke_test_output_plc.txt

	# run JBM modes - EXT is excluded as not supported yet		# run JBM modes - EXT is excluded as not supported yet
	modes_with_no_ext_out=$(./scripts/runIvasCodec.py -l \| grep -v MASA \| grep -v ISM)		# OMASA disabled for now
	modes_with_ext_out=$(./scripts/runIvasCodec.py -l \| grep 'MASA\\|ISM' \| grep -v ISM+)		modes_with_no_ext_out=$(./scripts/runIvasCodec.py -l \| grep -v ^MASA \| grep -v ^ISM \| grep -v OMASA)
			modes_with_ext_out=$(./scripts/runIvasCodec.py -l \| grep 'MASA\\|ISM' \| grep -v ^ISM+ \| grep -v OMASA)
	echo "\n======================= 4. JBM, modes with no EXT =======================\n\n"		echo "\n======================= 4. JBM, modes with no EXT =======================\n\n"
	./scripts/runIvasCodec.py -m $modes_with_no_ext_out -p $cfg $duration_arg $WORKERS --decoder_only --jbm_file $dly_profile \| tee smoke_test_output_jbm_noEXT.txt		./scripts/runIvasCodec.py -m $modes_with_no_ext_out -p $cfg $duration_arg $WORKERS --decoder_only --jbm_file $dly_profile \| tee smoke_test_output_jbm_noEXT.txt
	echo "\n======================= 5. JBM, modes with EXT =======================\n\n"		echo "\n======================= 5. JBM, modes with EXT =======================\n\n"