Merge remote-tracking branch 'origin' into 3gpp_issue_1348_fix (8908888f) · Commits · SA4 / Audio / IVAS BASOP

.gitlab-ci.yml

+171 −400

File changed.

Preview size limit exceeded, changes collapsed.

.gitlab-ci/variables.yml

0 → 100644

+65 −0

Original line number	Diff line number	Diff line
		variables:
		EVS_BE_TEST_DIR_BASOP: "/usr/local/be_2_evs_basop"
		FLOAT_REF_BRANCH: "ivas-float-update"
		SCRIPTS_DIR: "/usr/local/scripts"
		LONG_TEST_SUITE: "tests/codec_be_on_mr_nonselection tests/renderer --param_file scripts/config/self_test_ltv.prm --use_ltv"
		LONG_TEST_SUITE_NO_RENDERER: "tests/codec_be_on_mr_nonselection --param_file scripts/config/self_test_ltv.prm --use_ltv"
		SHORT_TEST_SUITE: "tests/codec_be_on_mr_nonselection"
		SHORT_TEST_SUITE_ENCODER: "tests/codec_be_on_mr_nonselection/test_param_file.py --param_file scripts/config/self_test_basop_encoder.prm"
		LONG_TEST_SUITE_ENCODER: "tests/codec_be_on_mr_nonselection/test_param_file.py --param_file scripts/config/self_test_ltv_basop_encoder.prm"
		TEST_SUITE: ""
		# These path variables are used by the pytest calls.
		# They can be overwritten in the job templates to e.g. only test encoder or decoder in the chain
		DUT_ENCODER_PATH: "./IVAS_cod"
		DUT_DECODER_PATH: "./IVAS_dec"
		REF_ENCODER_PATH: "./IVAS_cod_ref"
		REF_DECODER_PATH: "./IVAS_dec_ref"
		MERGE_TARGET_ENCODER_PATH: "./IVAS_cod_merge_target"
		MERGE_TARGET_DECODER_PATH: "./IVAS_dec_merge_target"
		# These path variables are used for building the binaries
		# They should never be overwritten!
		REF_ENCODER_PATH_FOR_BUILD_DO_NOT_MODIFY: "./IVAS_cod_ref"
		REF_DECODER_PATH_FOR_BUILD_DO_NOT_MODIFY: "./IVAS_dec_ref"
		MERGE_TARGET_ENCODER_PATH_FOR_BUILD_DO_NOT_MODIFY: "./IVAS_cod_merge_target"
		MERGE_TARGET_DECODER_PATH_FOR_BUILD_DO_NOT_MODIFY: "./IVAS_dec_merge_target"
		LEVEL_SCALING: "1.0"
		BASOP_CI_BRANCH_PC_REPO: "basop-ci-branch"
		PRM_FILES: "scripts/config/self_test.prm scripts/config/self_test_ltv.prm"
		TESTCASE_TIMEOUT_STV: 900
		TESTCASE_TIMEOUT_LTV: 2400
		TESTCASE_TIMEOUT_LTV_SANITIZERS: 10800
		CI_REGRESSION_THRESH_MLD: "0.1"
		CI_REGRESSION_THRESH_MAX_ABS_DIFF: "50"
		CI_REGRESSION_THRESH_SSNR: "-1"
		CI_REGRESSION_THRESH_ODG: "-0.05"
		INSTR_DIR: "scripts/c-code_instrument"
		BUILD_WITH_DEBUG_MODE_INFO: ""
		ENCODER_TEST: ""
		DELTA_ODG: ""
		COMPARE_DMX: ""
		SPLIT_COMPARISON: ""
		SKIP_REGRESSION_CHECK: ""
		FAILED_TESTCASES_LIST: "failed-testcases.txt"
		ERRORS_TESTCASES_LIST: "errors-testcases.txt"
		PYTEST_CACHE_ARTIFACT: "pytest_cache.zip"
		MEASURES_FOR_REPORT: "MLD MAX_ABS_DIFF MIN_SSNR MIN_ODG"
		FLOAT_REF_COMMIT_FILE: "float-ref-git-sha.txt"
		CUT_COMMIT_FILE: "CuT-git-sha.txt"
		MERGE_TARGET_COMMIT_FILE: "merge-target-git-sha.txt"
		MANUAL_PIPELINE_TYPE:
		description: "Type for the manual pipeline run. Use 'pytest-compare' to run comparison test against reference float codec."
		value: 'default'
		options:
		- 'default'
		- 'pytest-compare'
		- 'pytest-compare-enc-dmx'
		- 'pytest-compare-long'
		- 'pytest-compare-to-input'
		- 'pytest-saturation-smoke-test'
		- 'evs-26444'
		- 'sanitizer'
		- 'pytest-renderer'
		- 'complexity'
		- 'coverage'
		- 'voip-be-test'
		- 'peaq-enc-passthrough'

lib_com/basop32.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -1575,7 +1575,7 @@ Word32 L_msuNs_co( Word32 L_var3, Word16 var1, Word16 var2, Flag Carry, Flag O
		{
		Word32 L_var_out;

		L_var_out = L_mult( var1, var2 );
		L_var_out = L_mult_o( var1, var2, Overflow );
		L_var_out = L_sub_co( L_var3, L_var_out, Carry, Overflow );

		return ( L_var_out );
		@@ -2038,6 +2038,7 @@ Word32 DEPR_L_sub_c( Word32 L_var1, Word32 L_var2, Flag *Carry )

		return ( L_var_out );
		}

		Word32 L_sub_co( Word32 L_var1, Word32 L_var2, Flag Carry, Flag Overflow )
		{
		Word32 L_var_out;
		@@ -2056,6 +2057,7 @@ Word32 L_sub_co( Word32 L_var1, Word32 L_var2, Flag Carry, Flag Overflow )
		L_var_out = L_var1 - L_var2;
		if ( L_var1 > 0L )
		{
		set_overflow( Overflow );
		unset_carry( Carry );
		}
		}
		@@ -2067,18 +2069,22 @@ Word32 L_sub_co( Word32 L_var1, Word32 L_var2, Flag Carry, Flag Overflow )

		if ( ( L_test < 0 ) && ( L_var1 > 0 ) && ( L_var2 < 0 ) )
		{
		set_overflow( Overflow );
		carry_int = 0;
		}
		else if ( ( L_test > 0 ) && ( L_var1 < 0 ) && ( L_var2 > 0 ) )
		{
		set_overflow( Overflow );
		carry_int = 1;
		}
		else if ( ( L_test > 0 ) && ( ( L_var1 ^ L_var2 ) > 0 ) )
		{
		unset_overflow( Overflow );
		carry_int = 1;
		}
		if ( L_test == MIN_32 )
		{
		set_overflow( Overflow );
		carry_int ? set_carry( Carry ) : unset_carry( Carry );
		}
		else

lib_dec/ivas_core_dec_fx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1032,7 +1032,7 @@ ivas_error ivas_core_dec_fx(
		/* Memories Re-Scaling */
		Copy_Scale_sig_16_32_no_sat( hb_synth_16_fx[n], hb_synth_32_fx[n], L_FRAME48k, sub( Q11, Q_hb_synth_fx ) ); // Q11
		Copy_Scale_sig_16_32_no_sat( output_16_fx[n], output_32_fx[n], L_FRAME48k, sub( Q11, Q_input ) ); // Q11 // Q_input can get value <= -5
		Copy_Scale_sig_16_32_no_sat( synth_16_fx[n], synth_32_fx[n], L_FRAME48k, sub( Q11, Q_synth_fx ) ); // Q11
		Copy_Scale_sig_16_32_no_sat( synth_16_fx[n], synth_32_fx[n], output_frame, sub( Q11, Q_synth_fx ) ); // Q11

		IF( hBWE_FD != NULL )
		{

lib_dec/ivas_dirac_dec_fx.c

+17 −2

Original line number	Diff line number	Diff line
		@@ -1511,10 +1511,25 @@ void ivas_qmetadata_to_dirac_fx(
		{
		FOR( b = MASA_band_grouping_24[band_mapping[band]]; b < MASA_band_grouping_24[band_mapping[band + 1]]; ++b )
		{
		hSpatParamRendCom->azimuth2[meta_write_index][b] = extract_h( L_shr( q_direction->band_data[band].azimuth_fx[block], 6 ) );
		/* Right shifting -1 -> -1, Hence this change is done */
		Word32 L_tmp = L_abs( q_direction->band_data[band].azimuth_fx[block] );
		hSpatParamRendCom->azimuth2[meta_write_index][b] = extract_h( L_shr( L_tmp, 6 ) );
		move16();
		hSpatParamRendCom->elevation2[meta_write_index][b] = extract_h( L_shr( q_direction->band_data[band].elevation_fx[block], 6 ) );
		IF( q_direction->band_data[band].azimuth_fx[block] < 0 )
		{
		hSpatParamRendCom->azimuth2[meta_write_index][b] = negate( hSpatParamRendCom->azimuth2[meta_write_index][b] );
		move16();
		}

		L_tmp = L_abs( q_direction->band_data[band].elevation_fx[block] );
		hSpatParamRendCom->elevation2[meta_write_index][b] = extract_h( L_shr( L_tmp, 6 ) );
		move16();
		IF( q_direction->band_data[band].elevation_fx[block] < 0 )
		{
		hSpatParamRendCom->elevation2[meta_write_index][b] = negate( hSpatParamRendCom->elevation2[meta_write_index][b] );
		move16();
		}

		hSpatParamRendCom->energy_ratio2_fx[meta_write_index][b] = q_direction->band_data[band].energy_ratio_fx[block];
		move32();
		hSpatParamRendCom->diffuseness_vector_fx[meta_write_index][b] = L_sub( hSpatParamRendCom->diffuseness_vector_fx[meta_write_index][b], q_direction->band_data[band].energy_ratio_fx[block] );