Merge branch 'main-pc' of https://forge.3gpp.org/rep/sa4/audio/ivas-basop into... (f928d386) · Commits · SA4 / Audio / IVAS BASOP

.gitlab-ci.yml

+20 −20

Original line number	Diff line number	Diff line
		@@ -1052,7 +1052,7 @@ branch-is-up-to-date-with-target-pre:
		stage: prevalidate
		needs: []
		tags:
		- ivas-basop-linux
		- ivas-linux
		script:
		- *get-commits-behind-count
		- echo $commits_behind_count
		@@ -1067,7 +1067,7 @@ branch-is-up-to-date-with-target-post:
		- .rules-merge-request-to-main-pc
		stage: postvalidate
		tags:
		- ivas-basop-linux
		- ivas-linux
		script:
		- *get-commits-behind-count
		- echo $commits_behind_count
		@@ -1097,7 +1097,7 @@ check-naming-of-branch-for-main-pc-merges:
		- .rules-merge-request-to-main-pc
		stage: prevalidate
		tags:
		- ivas-basop-linux
		- ivas-linux
		script:
		- *update-scripts-repo
		- if [[ ! "$CI_MERGE_REQUEST_TITLE" =~ \[skip[[:space:]_-]name[[:space:]_-]check\] ]] && [[ ! "$CI_MERGE_REQUEST_TITLE" =~ \[CI\] ]]; then
		@@ -1114,7 +1114,7 @@ branch-is-up-to-date-with-target-pre:
		stage: prevalidate
		needs: []
		tags:
		- ivas-basop-linux
		- ivas-linux
		script:
		- *get-commits-behind-count
		- \|
		@@ -1128,7 +1128,7 @@ branch-is-up-to-date-with-target-post:
		- .rules-merge-request
		stage: postvalidate
		tags:
		- ivas-basop-linux
		- ivas-linux
		script:
		- *get-commits-behind-count
		- \|
		@@ -1150,7 +1150,7 @@ clang-format-check:
		ARTIFACT_BASE_NAME: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--formatting-fix"
		stage: prevalidate
		tags:
		- ivas-basop-linux
		- ivas-linux
		needs: []
		timeout: "5 minutes"
		script:
		@@ -1233,7 +1233,7 @@ build-codec-linux-make:
		extends:
		- .build-job-linux
		tags:
		- ivas-basop-linux
		- ivas-linux
		timeout: "10 minutes"
		script:
		- *print-common-info
		@@ -1251,7 +1251,7 @@ build-codec-linux-cmake:
		extends:
		- .build-job-linux
		tags:
		- ivas-basop-linux
		- ivas-linux
		timeout: "10 minutes"
		script:
		- *print-common-info
		@@ -1272,7 +1272,7 @@ build-codec-linux-instrumented-make:
		- .build-job-linux
		timeout: "10 minutes"
		tags:
		- ivas-basop-linux
		- ivas-linux
		script:
		- *print-common-info
		- *update-scripts-repo
		@@ -1286,7 +1286,7 @@ build-codec-sanitizers-linux:
		- .build-job-linux
		- .rules-basis
		tags:
		- ivas-basop-linux
		- ivas-linux
		timeout: "10 minutes"
		script:
		- *update-scripts-repo
		@@ -1703,7 +1703,7 @@ ivas-pytest-enc-msan:
		extends:
		- .test-job-linux
		tags:
		- ivas-basop-linux-fast
		- ivas-linux-fast
		before_script:
		- CLANG_NUM=1
		- DUT_DECODER_PATH=./$REF_DECODER_PATH
		@@ -1714,7 +1714,7 @@ ivas-pytest-enc-asan:
		extends:
		- .test-job-linux
		tags:
		- ivas-basop-linux-fast
		- ivas-linux-fast
		before_script:
		- CLANG_NUM=2
		- DUT_DECODER_PATH=./$REF_DECODER_PATH
		@@ -1725,7 +1725,7 @@ ivas-pytest-enc-usan:
		extends:
		- .test-job-linux
		tags:
		- ivas-basop-linux-fast
		- ivas-linux-fast
		before_script:
		- CLANG_NUM=3
		- DUT_DECODER_PATH=./$REF_DECODER_PATH
		@@ -1793,7 +1793,7 @@ ivas-pytest-dec-msan:
		extends:
		- .test-job-linux
		tags:
		- ivas-basop-linux-fast
		- ivas-linux-fast
		before_script:
		- CLANG_NUM=1
		- DUT_ENCODER_PATH=./$REF_ENCODER_PATH
		@@ -1804,7 +1804,7 @@ ivas-pytest-dec-asan:
		extends:
		- .test-job-linux
		tags:
		- ivas-basop-linux-fast
		- ivas-linux-fast
		before_script:
		- CLANG_NUM=2
		- DUT_ENCODER_PATH=./$REF_ENCODER_PATH
		@@ -1815,7 +1815,7 @@ ivas-pytest-dec-usan:
		extends:
		- .test-job-linux
		tags:
		- ivas-basop-linux-fast
		- ivas-linux-fast
		before_script:
		- CLANG_NUM=3
		- DUT_ENCODER_PATH=./$REF_ENCODER_PATH
		@@ -2095,7 +2095,7 @@ voip-be-on-merge-request:
		- .rules-merge-request-no-draft
		timeout: "20 minutes"
		tags:
		- ivas-basop-linux
		- ivas-linux
		stage: test
		needs: ["build-codec-linux-make"] #, "build-codec-instrumented-linux", "build-codec-sanitizers-linux"]
		script:
		@@ -2129,7 +2129,7 @@ renderer-pytest-on-merge-request:
		# TODO: set reasonable timeout, will most likely take less
		timeout: "20 minutes"
		tags:
		- ivas-basop-linux
		- ivas-linux
		stage: compare
		script:
		- *print-common-info
		@@ -2189,7 +2189,7 @@ ivas-pytest-on-merge-request:
		needs: ["build-codec-linux-make"] #, "codec-smoke-test"]
		timeout: "40 minutes"
		tags:
		- ivas-basop-linux
		- ivas-linux
		script:
		- *print-common-info
		- *get-commits-behind-count
		@@ -2682,7 +2682,7 @@ complexity-osba-in-binaural_room_ir-out:
		pages:
		stage: deploy
		tags:
		- ivas-basop-linux
		- ivas-linux
		rules:
		- if: $UPDATE_PAGES
		script:

lib_com/options.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -131,6 +131,8 @@
		#define FIX_998_UNUSED_FUNCTION /* FhG: issue 998: delete unused funtion ivas_dirac_dec_get_response_split_order */
		#define NONBE_FIX_1014_1015_1016_OSBA_JBM_STEREO /* FhG: issues #1014, #1015, #1016: fix tc buffer info update in the discrete ism renderer */
		#define NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING /* FhG: issue 987: solution b: downmix HOA3 to stereo a input for the reverberator */
		#define NONBE_FIX_1006_PAST_DMX_NRG_ERROR /* Eri/FhG: Issue 1006: Bug fix in ivas_stereo_dft_dec not replicated in ivas_stereo_dft_dec_dmx */


		/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_stereo_dft_dec_dmx_fx.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -378,10 +378,15 @@ void stereo_dft_unify_dmx_fx(
		Word16 idx_k0, idx_k1;
		Word16 q_shift0;
		Word16 q_shift1;
		#ifdef NONBE_FIX_1006_PAST_DMX_NRG_ERROR
		idx_k0 = add( hStereoDft->past_DMX_pos, STEREO_DFT_PAST_MAX - 1 ) & ( STEREO_DFT_PAST_MAX - 1 ); /* Q0 */
		idx_k1 = add( idx_k0, 1 ) & ( STEREO_DFT_PAST_MAX - 1 );
		#else
		idx_k0 = ( add( hStereoDft->past_DMX_pos, 1 ) ) % STEREO_DFT_PAST_MAX;
		move16();
		idx_k1 = ( add( idx_k0, 1 ) ) % STEREO_DFT_PAST_MAX;
		move16();
		#endif
		q_shift0 = sub( hStereoDft->q_dft, hStereoDft->q_DFT_past_DMX_fx[idx_k0] );
		q_shift1 = sub( hStereoDft->q_dft, hStereoDft->q_DFT_past_DMX_fx[idx_k1] );

lib_enc/ivas_stereo_dmx_evs_fx.c

+5 −6

Original line number	Diff line number	Diff line
		@@ -108,9 +108,9 @@
		#define STEREO_DMX_EVS_SGC_GIR_S 32617 // 1/1.00461543f
		#define STEREO_DMX_EVS_SGC_GL 32391 // 0.9885f
		#define STEREO_DMX_EVS_SGC_GH 33148 // 1.0116f
		#define STEREO_DMX_EVS_SGC_LEGY_THRES_16 2.5E8
		#define STEREO_DMX_EVS_SGC_LEGY_THRES_32 3.E8
		#define STEREO_DMX_EVS_SGC_LEGY_THRES_48 5.E8
		#define STEREO_DMX_EVS_SGC_LEGY_THRES_16 250000000
		#define STEREO_DMX_EVS_SGC_LEGY_THRES_32 300000000
		#define STEREO_DMX_EVS_SGC_LEGY_THRES_48 500000000
		#define STEREO_DMX_EVS_SGC_LEGY_THRES_E 22
		#define STEREO_DMX_EVS_SGC_GMAX 46340 // 1.4142f
		#define STEREO_DMX_EVS_SGC_GMIN 23170 // 0.7071f
		@@ -2116,7 +2116,8 @@ static void apply_gain_sgc(
		}

		W_tmp = W_mult_32_32( *gain, lr );
		*gain = W_shr( W_tmp, 16 );
		W_tmp = W_shr( W_tmp, 16 );
		*gain = W_extract_l( W_tmp );

		return;
		}
		@@ -2634,11 +2635,9 @@ void stereo_dmx_evs_enc_fx(
		}

		Copy_Scale_sig32_16( p_dmx_data, data, n_samples, 5 ); // Q26->Q15
		pop_wmops();

		pop_wmops();


		return;
		}