Merge branch 'main' into ci/complexity-measurements-cleanup (e8ab50b3) · Commits · SA4 / Audio / IVAS BASOP

.gitlab-ci.yml

+7 −6

Original line number	Diff line number	Diff line
		@@ -622,7 +622,7 @@ stages:
		- *print-common-info

		# create empty files for all artifacts to suppress warnings in case of no regressions found or all is BE
		- touch $XML_REPORT_BRANCH $XML_REPORT_MAIN $HTML_REPORT_BRANCH $HTML_REPORT_MAIN $CSV_BRANCH $CSV_MAIN $SUMMARY_HTML_ARTIFACT_NAME $FLOAT_REF_COMMIT_FILE $CUT_COMMIT_FILE $MERGE_TARGET_COMMIT_FILE regressions_crashes.csv regressions_MLD.csv regressions_MAXIMUM_ABS_DIFF.csv regressions_MIN_SSNR.csv regressions_MIN_ODG.csv improvements_crashes.csv improvements_MLD.csv improvements_MAXIMUM_ABS_DIFF.csv improvements_MIN_SSNR.csv improvements_MIN_ODG.csv
		- touch $XML_REPORT_BRANCH $XML_REPORT_MAIN $HTML_REPORT_BRANCH $HTML_REPORT_MAIN $CSV_BRANCH $CSV_MAIN $SUMMARY_HTML_ARTIFACT_NAME $FLOAT_REF_COMMIT_FILE $CUT_COMMIT_FILE $MERGE_TARGET_COMMIT_FILE regressions_crashes.csv regressions_MLD.csv regressions_MAX_ABS_DIFF.csv regressions_MIN_SSNR.csv regressions_MIN_ODG.csv improvements_crashes.csv improvements_MLD.csv improvements_MAX_ABS_DIFF.csv improvements_MIN_SSNR.csv improvements_MIN_ODG.csv
		- mkdir $IMAGES_ARTIFACT_NAME

		- set -euxo pipefail
		@@ -738,12 +738,12 @@ stages:
		- $MERGE_TARGET_COMMIT_FILE
		- regressions_crashes.csv
		- regressions_MLD.csv
		- regressions_MAXIMUM_ABS_DIFF.csv
		- regressions_MAX_ABS_DIFF.csv
		- regressions_MIN_SSNR.csv
		- regressions_MIN_ODG.csv
		- improvements_crashes.csv
		- improvements_MLD.csv
		- improvements_MAXIMUM_ABS_DIFF.csv
		- improvements_MAX_ABS_DIFF.csv
		- improvements_MIN_SSNR.csv
		- improvements_MIN_ODG.csv
		expose_as: "pytest compare results"
		@@ -986,6 +986,7 @@ build-codec-linux-make:
		when: never
		extends:
		- .build-job-linux
		timeout: "10 minutes"
		script:
		- *print-common-info
		- *activate-Werror-linux
		@@ -1002,7 +1003,7 @@ build-codec-linux-instrumented-make:
		when: never
		extends:
		- .build-job-linux
		timeout: "7 minutes"
		timeout: "10 minutes"
		script:
		- *print-common-info
		- *update-scripts-repo
		@@ -1019,7 +1020,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:
		@@ -1037,7 +1038,7 @@ build-codec-windows-msbuild:
		when: never
		extends:
		- .build-job-windows
		timeout: "7 minutes"
		timeout: "10 minutes"
		tags:
		- ivas-windows
		script:

lib_enc/analy_sp_fx.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -438,7 +438,7 @@ void ivas_analy_sp_fx(
		Word16 q_fr_bands, / o : energy in critical frequency bands Q0 */
		Word32 lf_E, / o : per bin E for first... q_lf_E */
		Word16 q_lf_E, / o : per bin E for first... Q0 */
		Word16 Etot, / o : total input energy Q8 */
		Word32 Etot, / o : total input energy Q24 */
		const Word16 min_band, /* i : minimum critical band Q0 */
		const Word16 max_band, /* i : maximum critical band Q0 */
		Word32 Bin_E, / o : per-bin energy spectrum q_Bin_E */
		@@ -557,7 +557,7 @@ void ivas_analy_sp_fx(

		/* Average total log energy over both half-frames */
		/* Etot = 10.0f (float)log10(0.5f * Etot); /
		Etot = -12800 / 10.f * logf(0.00001f) in Q8 */;
		Etot = -838860800 / 10.f * log10f(0.00001f) in Q24 : This is when LEtot is 0*/;
		move16();
		IF( LEtot != 0 )
		{
		@@ -566,7 +566,7 @@ void ivas_analy_sp_fx(
		LEtot = W_shl( LEtot, exp ); // q_fr_bands+2+exp
		Ltmp = BASOP_Util_Log10( W_extract_h( LEtot ), sub( 61, add( q_fr_bands, exp ) ) / 31-(q_fr_bands+2+exp-32) */ ); // Q25
		Ltmp = Mpy_32_32( Ltmp, 1342177280 /* 10.f in Q27 */ ); // (Q25, Q27) -> Q21
		*Etot = extract_h( L_shl( Ltmp, Q24 - Q21 ) ); // Q8
		*Etot = L_shl( Ltmp, Q24 - Q21 ); // Q24
		move16();
		}
		}
		@@ -599,7 +599,7 @@ void ivas_analy_sp_fx(
		}

		/* Average total log energy over both half-frames */
		Etot = -12800 / 10.f * logf(0.00001f) in Q8 */;
		Etot = -838860800 / 10.f * log10f(0.00001f) in Q24 : This is when LEtot is 0*/;
		move16();
		IF( LEtot != 0 )
		{
		@@ -607,7 +607,7 @@ void ivas_analy_sp_fx(
		LEtot = W_shl( LEtot, exp ); // q_fr_bands+exp
		Ltmp = BASOP_Util_Log10( W_extract_h( LEtot ), sub( 62, add( q_fr_bands, exp ) ) / 31-(q_fr_bands+1+exp-32) */ ); // Q25
		Ltmp = Mpy_32_32( Ltmp, 1342177280 /* 10.f in Q27 */ ); // (Q25, Q27) -> Q21
		*Etot = extract_h( L_shl( Ltmp, Q24 - Q21 ) ); // Q8
		*Etot = L_shl( Ltmp, Q24 - Q21 ); // Q24
		move16();
		}
		}

lib_enc/find_uv_fx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -729,7 +729,7 @@ Word16 find_uv_ivas_fx( /* o : coding typ
		* Total frame energy difference (dE3)
		-----------------------------------------------------------------/

		dE3 = sub( Etot, hNoiseEst->Etot_last_fx ); /Q8/
		dE3 = sub( Etot, extract_h( hNoiseEst->Etot_last_32fx ) ); /Q8/

		/-----------------------------------------------------------------
		* Energy decrease after spike (dE2)

lib_enc/init_enc_fx.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -1184,6 +1184,8 @@ ivas_error init_encoder_ivas_fx(

		st->mem_preemph_fx = 0;
		move16();
		st->mem_preemph_fx_q_inp = 0;
		move16();
		st->mem_preemph16k_fx = 0;
		move16();
		st->mem_preemph_enc = 0;
		@@ -1298,6 +1300,8 @@ ivas_error init_encoder_ivas_fx(
		/* stereo switching memories */
		st->mem_preemph_DFT_fx = 0;
		move16();
		st->mem_preemph_DFT_fx_q_inp = 0;
		move16();
		set16_fx( st->inp_12k8_mem_stereo_sw_fx, 0, sub( sub( STEREO_DFT_OVL_12k8, L_MEM_RECALC_12K8 ), L_FILT ) );
		st->mem_preemph16k_DFT_fx = 0;
		move16();
		@@ -1397,6 +1401,7 @@ ivas_error init_encoder_ivas_fx(
		st->q_Bin_E_old = Q31;
		move16();
		set16_fx( st->mem_decim_fx, 0, shl( L_FILT_MAX, 1 ) );
		set16_fx( st->mem_decim_fx_q_inp, 0, shl( L_FILT_MAX, 1 ) );
		set16_fx( st->mem_decim16k_fx, 0, shl( L_FILT_MAX, 1 ) );
		set16_fx( st->old_inp_12k8_fx, 0, L_INP_MEM );
		set16_fx( st->old_inp_16k_fx, 0, L_INP_MEM );
		@@ -1410,6 +1415,10 @@ ivas_error init_encoder_ivas_fx(
		set16_fx( st->input_buff_fx, 0, add( L_FRAME48k, add( L_FRAME48k, NS2SA( 48000, DELAY_FIR_RESAMPL_NS ) ) ) );
		st->q_inp = Q15;
		move16();
		st->mem_preemph_q = Q15;
		move16();
		st->mem_q = Q15;
		move16();
		st->q_old_inp = Q15;
		move16();
		set32_fx( st->input_buff32_fx, 0, add( L_FRAME48k, add( L_FRAME48k, NS2SA( 48000, DELAY_FIR_RESAMPL_NS ) ) ) );

lib_enc/ivas_core_pre_proc_front_fx.c

+54 −48

File changed.

Preview size limit exceeded, changes collapsed.