Merge remote-tracking branch 'remotes/origin/main' into 1315-ivas_max_output_channels (5cac7996) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+13 −6

Original line number	Diff line number	Diff line
		variables:
		# note: GitLab cannot reference variables defined by users in the include ref:, we need to use a YAML anchor for this
		# see https://docs.gitlab.com/ci/yaml/includes/#use-variables-with-include for more information
		IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF 4eb4c0dfbdc845280a9994b5f7540f69c737537b
		IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF 44cb5638949b874ce0f5c3bf4359f9db860d88bc

		include:
		- local: .gitlab-ci/variables.yml
		@@ -352,6 +352,13 @@ build-codec-instrumented-linux:
		- bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh
		- ./scripts/prepare_instrumentation.sh
		- make -j -C scripts/c-code_instrument
		artifacts:
		when: always
		access: all
		expire_in: "30 days"
		paths:
		- wmc_tool_output.txt


		# make sure that the codec builds with msan, asan and usan
		build-codec-sanitizers-linux:
		@@ -1585,7 +1592,7 @@ ltv-msan:
		- .sanitizer-selftest-anchor
		rules:
		- if: $SANITIZER_SCHEDULE_E
		timeout: 4 hours
		timeout: 5 hours
		tags:
		- ivas-linux-fast
		before_script:
		@@ -1603,10 +1610,10 @@ ltv-asan:
		rules:
		- if: $SANITIZER_SCHEDULE_E
		when: delayed
		start_in: 4 hours
		start_in: 5 hours
		tags:
		- ivas-linux-fast
		timeout: 4 hours
		timeout: 5 hours
		before_script:
		- !reference [.job-linux, before_script]
		- CLANG_NUM=2
		@@ -1622,10 +1629,10 @@ ltv-usan:
		rules:
		- if: $SANITIZER_SCHEDULE_E
		when: delayed
		start_in: 7 hours
		start_in: 8 hours
		tags:
		- ivas-linux-fast
		timeout: 4 hours
		timeout: 5 hours
		before_script:
		- !reference [.job-linux, before_script]
		- CLANG_NUM=3

+1 −1

Original line number	Diff line number	Diff line
		@@ -298,7 +298,7 @@ int main(
		if ( arg.hrtfReaderEnabled )
		{
		/* sanity check */
		if ( arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		if ( arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
		{
		arg.hrtfReaderEnabled = false;
		fprintf( stderr, "\nError: HRTF binary file cannot be used in this output configuration.\n\n" );

+1 −1

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@ fi
		# Replace only the first occurrence, as "basop" may be present in the later description
		# If the format is correct, then before "_basop", only numbers can occur
		float_ref_branchname="${branchname/basop/ref}"
		git_result=$(git branch -av)
		git_result=$(git branch -a)

		# If the branch does not exist, default to "float-pc"
		if [[ "$git_result" =~ "$float_ref_branchname" ]]; then

+10 −4

Original line number	Diff line number	Diff line
		@@ -552,7 +552,9 @@ ivas_error config_acelp1(
		const int16_t tdm_lp_reuse_flag, /* i : LPC reuse flag (can be 1 only with secondary channel */
		const int16_t tdm_low_rate_mode, /* i : secondary channel low rate mode flag */
		const int16_t idchan, /* i : stereo channel ID */
		#ifndef NONBE_1325_TD_STEREO_QUANT_LSF_SEC
		const int16_t active_cnt, /* i : Active frame counter */
		#endif
		const int16_t tdm_Pitch_reuse_flag, /* i : primary channel pitch reuse flag*/
		const int16_t tdm_LRTD_flag, /* i : LRTD stereo mode flag */
		const int16_t GSC_IVAS_mode /* i : GSC IVAS mode */
		@@ -770,7 +772,11 @@ ivas_error config_acelp1(

		bits -= acelp_cfg->mid_lsf_bits;
		}
		#ifdef NONBE_1325_TD_STEREO_QUANT_LSF_SEC
		else if ( tdm_lp_reuse_flag == 1 && idchan == 1 )
		#else
		else if ( tdm_lp_reuse_flag == 1 && idchan == 1 && active_cnt != 1 )
		#endif
		{
		bits -= TDM_IC_LSF_PRED_BITS;
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -524,6 +524,9 @@ enum
		#define ACELP_TCX_TRANS_NS 1250000 /* Duration of the ACELP->TCX overlap - 1.25 ms */
		#define L_FRAME_MAX L_FRAME48k /* Max 20ms frame size @48kHz */
		#define L_FRAME_PLUS 1200 /* Max frame size (long TCX frame) */
		#ifdef FIX_1320_STACK_CPE_DECODER
		#define L_FRAME_PLUS_INTERNAL 800 /* Max frame size (long TCX frame) at maximum internal sampling rate */
		#endif
		#define L_MDCT_OVLP_MAX NS2SA( 48000, ACELP_LOOK_NS ) /* = Max mdct overlap */
		#define N_TCX10_MAX 480 /* Max size of TCX10 MDCT spectrum */
		#define BITS_TEC 1 /* number of bits for TEC */