Merge branch 'main' into test_wmc_tool_v15 (e473715b) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+8 −3

Original line number	Diff line number	Diff line
		@@ -159,6 +159,12 @@ stages:
		.check-commits-behind-count-in-compare-jobs: &check-commits-behind-count-in-compare-jobs
		- if [ $commits_behind_count -ne 0 ]; then echo "Your branch is not up-to-date with main -> Compare tests will not run as they can contain false negatives this way.\nMain might have changed during your pipeline run. Run 'git merge origin/main' to update."; exit 1; fi

		.copy-ltv-files-to-testv-dir: &copy-ltv-files-to-testv-dir
		- cp "$LTV_DIR"/*.wav scripts/testv/
		- cp "$LTV_DIR"/*.met scripts/testv/
		- cp "$LTV_DIR"/*.csv scripts/testv/


		# ---------------------------------------------------------------
		# Job templates
		# ---------------------------------------------------------------
		@@ -1233,9 +1239,7 @@ test-long-self-test:
		### prepare pytest

		# Copy test vectors from LTV to TESTV
		- cp "$LTV_DIR"/*.wav scripts/testv/
		- cp "$LTV_DIR"/*.met scripts/testv/
		- cp "$LTV_DIR"/*.csv scripts/testv/
		- *copy-ltv-files-to-testv-dir

		# create references
		- exit_code_ref=0
		@@ -1519,6 +1523,7 @@ coverage-test-on-main-scheduled:
		script:
		- *print-common-info
		- *update-ltv-repo
		- *copy-ltv-files-to-testv-dir
		- make GCOV=1 -j
		- cp IVAS_rend IVAS_rend_ref # Copy exec to be able to run renderer script
		- python3 tests/create_short_testvectors.py

+2 −0

Original line number	Diff line number	Diff line
		@@ -154,6 +154,7 @@
		#define FIX_814_DOUBLE_PREC_IN_REVERB /* Philips: Issue 814: Replace double precision arithmetic in reverb */
		#define FIX_866_MOVE_VBAP /* Nokia: Issue 866: Move VBAP to lib_rend */
		#define FIX_863_REMOVE_REDUNDANCIES_OMASA /* Nokia/VA: Issue 863: Remove redundancies in stereo_classifier for OMASA */
		#define FIX_879_USAN_ERROR_IN_MASA_DECODING /* FhG: Issue 879 : avoid arithmetic with NULL pointer in the DirAC decoder to fix USAN error */

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

		@@ -168,6 +169,7 @@
		#define BE_FIX_867_PARAMC_RECONFIG /* FhG: issue #867: fix ParamMC CLDFB buffer dealloc when reconfiguring */
		#define NONBE_FIX_850_MASA_HBR_META_RATIO_DECODING /* Nokia: issue #850: Fixes rare non-valid diffuseness and energy ratio values in 2dir MASA. */
		#define NONBE_FIX_MDCT_STEREO_DTX_MONO_OUT /* FhG: fix clicks in DTX -> active transition frames in MDCT-Stereo with mono output */
		#define NONBE_FIX_836_PARAMUPMIX_HEADROT /* Dlb: issue #836: Resolve "ParamUpmix MC to SBA conversion done on the already binaurlized output" */

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -868,13 +868,23 @@ ivas_error ivas_dec(

		ivas_mc_paramupmix_dec( st_ivas, p_output );

		#ifdef NONBE_FIX_836_PARAMUPMIX_HEADROT
		if ( st_ivas->transport_config != st_ivas->intern_config &&
		( st_ivas->intern_config == IVAS_AUDIO_CONFIG_FOA \|\| st_ivas->intern_config == IVAS_AUDIO_CONFIG_HOA2 \|\| st_ivas->intern_config == IVAS_AUDIO_CONFIG_HOA3 ) &&
		( output_config == IVAS_AUDIO_CONFIG_FOA \|\| output_config == IVAS_AUDIO_CONFIG_HOA2 \|\| output_config == IVAS_AUDIO_CONFIG_HOA3 ) )
		#else
		if ( st_ivas->transport_config != st_ivas->intern_config && ( st_ivas->intern_config == IVAS_AUDIO_CONFIG_FOA \|\| st_ivas->intern_config == IVAS_AUDIO_CONFIG_HOA2 \|\| st_ivas->intern_config == IVAS_AUDIO_CONFIG_HOA3 ) )
		#endif
		{
		ivas_mc2sba( st_ivas->hTransSetup, p_output, p_output, output_frame, st_ivas->hIntSetup.ambisonics_order, GAIN_LFE );
		}

		/* Rendering */
		#ifdef NONBE_FIX_836_PARAMUPMIX_HEADROT
		if ( ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV \|\| st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) && !st_ivas->hDecoderConfig->Opt_Headrotation )
		#else
		if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV \|\| st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )
		#endif
		{
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		if ( output_config != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED && output_config != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

+4 −0

Original line number	Diff line number	Diff line
		@@ -1812,7 +1812,11 @@ void ivas_dirac_dec_render_sf(
		DirAC_mem = hDirACRend->stack_mem;

		reference_power = DirAC_mem.reference_power;
		#ifdef FIX_879_USAN_ERROR_IN_MASA_DECODING
		reference_power_smooth = ( DirAC_mem.reference_power == NULL ) ? NULL : DirAC_mem.reference_power + hSpatParamRendCom->num_freq_bands;
		#else
		reference_power_smooth = DirAC_mem.reference_power + hSpatParamRendCom->num_freq_bands;
		#endif
		onset_filter = DirAC_mem.onset_filter;
		onset_filter_subframe = ( DirAC_mem.onset_filter == NULL ) ? NULL : DirAC_mem.onset_filter + hSpatParamRendCom->num_freq_bands;

+6 −1

Original line number	Diff line number	Diff line
		@@ -1352,14 +1352,19 @@ ivas_error ivas_jbm_dec_render(
		{
		ivas_mc_paramupmix_dec_render( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_tc, p_output );


		#ifndef NONBE_FIX_836_PARAMUPMIX_HEADROT
		if ( st_ivas->transport_config != st_ivas->intern_config && ( st_ivas->intern_config == IVAS_AUDIO_CONFIG_FOA \|\| st_ivas->intern_config == IVAS_AUDIO_CONFIG_HOA2 \|\| st_ivas->intern_config == IVAS_AUDIO_CONFIG_HOA3 ) )
		{
		ivas_mc2sba( st_ivas->hTransSetup, p_output, p_output, *nSamplesRendered, st_ivas->hIntSetup.ambisonics_order, GAIN_LFE );
		}
		#endif

		/* Rendering */
		#ifdef NONBE_FIX_836_PARAMUPMIX_HEADROT
		if ( ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV \|\| st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) && !st_ivas->hDecoderConfig->Opt_Headrotation )
		#else
		if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV \|\| st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )
		#endif
		{
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		/handled in CLDFB domain already/