Merge branch 'float-pc' into 1205_ref_744_step_2_nonbe_fix_binary_binaural_reading (26156786) · Commits · SA4 / Audio / IVAS BASOP

.gitlab-ci.yml

+10 −8

Original line number	Diff line number	Diff line
		@@ -860,7 +860,7 @@ uninterruptible:

		branch-is-up-to-date-with-target-pre:
		extends:
		- .rules-merge-request
		- .rules-merge-request-to-float-pc
		stage: prevalidate
		needs: []
		tags:
		@@ -876,7 +876,7 @@ branch-is-up-to-date-with-target-pre:

		branch-is-up-to-date-with-target-post:
		extends:
		- .rules-merge-request
		- .rules-merge-request-to-float-pc
		stage: postvalidate
		tags:
		- ivas-linux
		@@ -1048,6 +1048,7 @@ build-codec-linux-make:
		- .build-job-linux
		tags:
		- ivas-linux
		timeout: "10 minutes"
		script:
		- *print-common-info
		- *activate-Werror-linux
		@@ -1064,7 +1065,7 @@ build-codec-linux-instrumented-make:
		when: never
		extends:
		- .build-job-linux
		timeout: "7 minutes"
		timeout: "10 minutes"
		tags:
		- ivas-linux
		script:
		@@ -1080,6 +1081,7 @@ build-codec-sanitizers-linux:
		- .rules-basis
		tags:
		- ivas-linux
		timeout: "10 minutes"
		script:
		- *update-scripts-repo
		- *print-common-info
		@@ -1096,7 +1098,7 @@ build-codec-windows-msbuild:
		when: never
		extends:
		- .build-job-windows
		timeout: "7 minutes"
		timeout: "10 minutes"
		tags:
		- ivas-windows
		script:
		@@ -1111,7 +1113,7 @@ build-codec-windows-msbuild:
		split-rendering-smoke-test:
		extends:
		- .test-job-linux
		- .rules-merge-request
		- .rules-merge-request-to-float-pc
		needs: ["build-codec-linux-make"]
		stage: test
		script:
		@@ -1135,7 +1137,7 @@ split-rendering-smoke-test:
		lc3-wrapper-unit-test:
		extends:
		- .test-job-linux
		- .rules-merge-request
		- .rules-merge-request-to-float-pc
		needs: ["build-codec-linux-make"]
		stage: test
		script:
		@@ -1147,10 +1149,10 @@ lc3-wrapper-unit-test:
		- scripts/split_rendering/lc3plus_float/ivas_lc3plus_unit_test

		# compare split-rendering bitexactness between target and source branch
		.split-rendering-pytest-on-merge-request:
		split-rendering-pytest-on-merge-request:
		extends:
		- .test-job-linux-needs-testv-dir
		- .rules-merge-request
		- .rules-merge-request-to-float-pc
		needs: ["build-codec-linux-make"]
		# TODO: set reasonable timeout, will most likely take less
		timeout: "30 minutes"

apps/decoder.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -1643,7 +1643,6 @@ static bool parseCmdlIVAS_dec(
		* Mandatory input arguments
		-----------------------------------------------------------------/

		#ifdef FIX_956_DECODER_COMMAND_LINE_FIX
		if ( i < argc - 4 )
		{
		for ( i = 1; i < argc; i++ )
		@@ -1661,9 +1660,6 @@ static bool parseCmdlIVAS_dec(
		return false;
		}
		else if ( i < argc - 3 )
		#else
		if ( i < argc - 3 )
		#endif
		{
		arg->outputConfig = cmdline2config( argv[i] );
		if ( arg->outputConfig == IVAS_AUDIO_CONFIG_LS_CUSTOM )

lib_com/ivas_cnst.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -320,9 +320,7 @@ typedef enum
		#define ISM_Q_STEP 2.5f
		#define ISM_Q_STEP_BORDER 5.0f

		#ifdef NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA
		#define ISM_FEC_MAX 10
		#endif

		#define ISM_RADIUS_NBITS 6
		#define ISM_RADIUS_MIN 0.0f

lib_com/ivas_dirac_com.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -447,10 +447,14 @@ ivas_error ivas_dirac_sba_config(
		else
		{
		hQMetaData->useLowerBandRes = 0;
		#ifndef NONBE_FIX_973_HODIRAC_BAND_GROUPING
		if ( hodirac_flag == 0 )
		{
		nbands_coded = nbands - 1; /* always combine the last two bands */
		}
		#else
		nbands_coded = nbands - 1; /* always combine the last two bands */
		#endif
		}

		{

lib_com/ivas_prot.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -5489,7 +5489,11 @@ void ivas_mono_dmx_renderer_close(
		MONO_DOWNMIX_RENDERER_HANDLE hMonoDmxRenderer / i/ i/o: Mono downmix structure */
		);

		#ifdef NONBE_FIX_967_ISM_MONO_DMX
		void ivas_ism_mono_dmx(
		#else
		void ivas_mono_downmix_render_passive(
		#endif
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		float output_f[], / i/o: synthesized core-coder transport channels/mono output */
		const int16_t output_frame /* i : output frame length */