Merge branch 'main-pc' into 1205_basop_744_step_2_nonbe_fix_binary_binaural_reading (bd973b2b) · Commits · SA4 / Audio / IVAS BASOP

.gitlab-ci.yml

+13 −6

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

		branch-is-up-to-date-with-target-pre:
		extends:
		- .rules-merge-request
		- .rules-merge-request-to-main-pc
		stage: prevalidate
		needs: []
		tags:
		@@ -1063,7 +1063,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-main-pc
		stage: postvalidate
		tags:
		- ivas-basop-linux
		@@ -1251,6 +1251,7 @@ build-codec-linux-cmake:
		- .build-job-linux
		tags:
		- ivas-basop-linux
		timeout: "10 minutes"
		script:
		- *print-common-info
		- *update-scripts-repo
		@@ -1322,7 +1323,7 @@ build-codec-linux-debugging-make:
		when: never
		extends:
		- .build-job-linux
		timeout: "7 minutes"
		timeout: "10 minutes"
		variables:
		BUILD_WITH_DEBUG_MODE_INFO: "true"
		script:
		@@ -1337,7 +1338,7 @@ build-codec-linux-debugging-make:
		split-rendering-smoke-test:
		extends:
		- .test-job-linux
		- .rules-merge-request
		- .rules-merge-request-to-main-pc
		needs: ["build-codec-linux-make"]
		stage: test
		script:
		@@ -1361,7 +1362,7 @@ split-rendering-smoke-test:
		lc3-wrapper-unit-test:
		extends:
		- .test-job-linux
		- .rules-merge-request
		- .rules-merge-request-to-main-pc
		needs: ["build-codec-linux-make"]
		stage: test
		script:
		@@ -1376,7 +1377,7 @@ lc3-wrapper-unit-test:
		split-rendering-pytest-on-merge-request:
		extends:
		- .test-job-linux-needs-testv-dir
		- .rules-merge-request
		- .rules-merge-request-to-main-pc
		needs: ["build-codec-linux-make"]
		timeout: "45 minutes"
		stage: compare
		@@ -1467,6 +1468,7 @@ check-be-to-target-short-enc-0db:
		- .rules-mr-to-main-or-main-pc
		- .test-job-linux
		before_script:
		- *set-reference-for-basop-port-branch
		- USE_LTV=0
		- DUT_DECODER_PATH=./IVAS_dec_ref
		- MERGE_TARGET_DECODER_PATH=./IVAS_dec_ref
		@@ -1480,6 +1482,7 @@ check-be-to-target-short-enc-+10db:
		- .rules-mr-to-main-or-main-pc
		- .test-job-linux
		before_script:
		- *set-reference-for-basop-port-branch
		- USE_LTV=0
		- DUT_DECODER_PATH=./IVAS_dec_ref
		- MERGE_TARGET_DECODER_PATH=./IVAS_dec_ref
		@@ -1493,6 +1496,7 @@ check-be-to-target-short-enc--10db:
		- .rules-mr-to-main-or-main-pc
		- .test-job-linux
		before_script:
		- *set-reference-for-basop-port-branch
		- USE_LTV=0
		- DUT_DECODER_PATH=./IVAS_dec_ref
		- MERGE_TARGET_DECODER_PATH=./IVAS_dec_ref
		@@ -1506,6 +1510,7 @@ check-be-to-target-short-dec-0db:
		- .rules-mr-to-main-or-main-pc
		- .test-job-linux
		before_script:
		- *set-reference-for-basop-port-branch
		- USE_LTV=0
		- DUT_ENCODER_PATH=./IVAS_cod_ref
		- MERGE_TARGET_ENCODER_PATH=./IVAS_cod_ref
		@@ -1519,6 +1524,7 @@ check-be-to-target-short-dec-+10db:
		- .rules-mr-to-main-or-main-pc
		- .test-job-linux
		before_script:
		- *set-reference-for-basop-port-branch
		- USE_LTV=0
		- DUT_ENCODER_PATH=./IVAS_cod_ref
		- MERGE_TARGET_ENCODER_PATH=./IVAS_cod_ref
		@@ -1532,6 +1538,7 @@ check-be-to-target-short-dec--10db:
		- .rules-mr-to-main-or-main-pc
		- .test-job-linux
		before_script:
		- *set-reference-for-basop-port-branch
		- USE_LTV=0
		- DUT_ENCODER_PATH=./IVAS_cod_ref
		- MERGE_TARGET_ENCODER_PATH=./IVAS_cod_ref

apps/decoder.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -1424,7 +1424,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++ )
		@@ -1442,9 +1441,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
		@@ -360,9 +360,7 @@ typedef enum
		#define ISM_Q_STEP_BORDER 5.0f
		#define ISM_Q_STEP_BORDER_FX ( 20971520 ) // Q22

		#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_fx.c

+4 −0

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

		{

lib_com/ivas_prot_fx.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -1160,7 +1160,11 @@ void ivas_apply_non_diegetic_panning_fx(
		const Word16 output_frame /* i : output frame length per channel */
		);

		#ifdef NONBE_FIX_967_ISM_MONO_DMX
		void ivas_ism_mono_dmx_fx(
		#else
		void ivas_mono_downmix_render_passive_fx(
		#endif
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		Word32 output_f_fx[], / i/o: synthesized core-coder transport channels/mono output */
		const Word16 output_frame /* i : output frame length */