Merge branch 'main' into 471-integrate-the-multichannel-parametric-upmix-into-the-jbm-path (e248c628) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+20 −7

Original line number	Diff line number	Diff line
		@@ -953,7 +953,7 @@ sanitizer-test-ism3:
		- if: $SANITIZER_SCHEDULE_A
		when: delayed
		start_in: 11 hours
		timeout: 3 hour
		timeout: 4 hour
		script:
		- *update-ltv-repo
		- python3 ci/run_scheduled_sanitizer_test.py ISM3 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS
		@@ -963,8 +963,8 @@ sanitizer-test-ism4:
		rules:
		- if: $SANITIZER_SCHEDULE_A
		when: delayed
		start_in: 14 hours
		timeout: 4 hours
		start_in: 15 hours
		timeout: 6 hours
		script:
		- *update-ltv-repo
		- python3 ci/run_scheduled_sanitizer_test.py ISM4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS
		@@ -974,7 +974,7 @@ sanitizer-test-masa:
		rules:
		- if: $SANITIZER_SCHEDULE_A
		when: delayed
		start_in: 18 hours
		start_in: 21 hours
		timeout: 3 hours
		script:
		- *update-ltv-repo
		@@ -1092,7 +1092,7 @@ sanitizer-test-ism+3:
		- if: $SANITIZER_SCHEDULE_D
		when: delayed
		start_in: 5 hours
		timeout: 3 hour
		timeout: 4 hours
		script:
		- *update-ltv-repo
		- python3 ci/run_scheduled_sanitizer_test.py ISM+3 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS
		@@ -1102,8 +1102,8 @@ sanitizer-test-ism+4:
		rules:
		- if: $SANITIZER_SCHEDULE_D
		when: delayed
		start_in: 8 hours
		timeout: 4 hours
		start_in: 9 hours
		timeout: 6 hours
		script:
		- *update-ltv-repo
		- python3 ci/run_scheduled_sanitizer_test.py ISM+4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS
		@@ -1193,6 +1193,7 @@ coverage-test-on-main-scheduled:
		stage: test
		artifacts:
		name: "$CI_JOB_NAME--$CI_COMMIT_REF_NAME--sha-$CI_COMMIT_SHA"
		when: always
		expire_in: 1 week
		paths:
		- $CI_JOB_NAME-public
		@@ -1209,7 +1210,9 @@ complexity-stereo-in-stereo-out:
		- in_format=stereo
		- out_format=stereo
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format"
		- ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		complexity-ism-in-binaural-out:
		extends:
		@@ -1225,7 +1228,9 @@ complexity-ism-in-binaural-out:
		- in_format=ISM
		- out_format=BINAURAL
		- bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format"
		- ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		complexity-sba-hoa3-in-hoa3-out:
		extends:
		@@ -1241,7 +1246,9 @@ complexity-sba-hoa3-in-hoa3-out:
		- in_format=SBA
		- out_format=HOA3
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format"
		- ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		complexity-mc-in-7_1_4-out:
		extends:
		@@ -1257,7 +1264,9 @@ complexity-mc-in-7_1_4-out:
		- in_format=MC
		- out_format=7_1_4
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format"
		- ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		complexity-masa-in-7_1_4-out:
		extends:
		@@ -1273,7 +1282,9 @@ complexity-masa-in-7_1_4-out:
		- in_format=MASA
		- out_format=7_1_4
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format"
		- ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		complexity-StereoDmxEVS-stereo-in-mono-out:
		extends:
		@@ -1289,7 +1300,9 @@ complexity-StereoDmxEVS-stereo-in-mono-out:
		- in_format=StereoDmxEVS
		- out_format=mono
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format"
		- ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		# ---------------------------------------------------------------
		# Other jobs

ci/complexity_measurements/getWmops.sh

+4 −1

Original line number	Diff line number	Diff line
		@@ -53,8 +53,11 @@ config_file="scripts/config/ci_linux_ltv.json"
		wmopsFilenameFlcLast=wmops_newsletter_stereo__${commit_sha}_${date}
		wmopsFilenameFlc=${destDir}/wmops/logs/${wmopsFilenameFlcLast}

		ret_val=0

		# instrument and build
		./scripts/IvasBuildAndRunChecks.py -p $config_file --checks COMPLEXITY --create_complexity_tables ${wmopsFilenameFlc} -C $ivas_format -f ${ep} --oc $output_format
		ret_val=$?

		# get the info on worst-case operating point: WMOPS number, enc-operating mode, dec-operating mode
		### WMOPS
		@@ -83,4 +86,4 @@ ${scriptDir}/parseNewsletterRom.py ${wmopsFilenameFlc}_PROM.csv ${wmopsFilenameF
		# generate java script from database
		tcsh ${scriptDir}/genWebpageData_Rom.csh ${destDir}/wmops/log_rom_all.txt ${destDir}/wmops/graphs_rom_flc.js Graphs_ROM


		exit $ret_val
		No newline at end of file

lib_com/ivas_cnst.h

+7 −0

Original line number	Diff line number	Diff line
		@@ -309,8 +309,12 @@ typedef enum
		#define MIN_BRATE_SWB_STEREO IVAS_13k2 /* min. stereo bitrate where SWB is supported */
		#define MIN_BRATE_FB_STEREO IVAS_32k /* min. SCE and stereo bitrate where FB is supported */
		#ifdef ISM_FB
		#ifdef ISM_FB_16k4
		#define MIN_BRATE_FB_ISM 16000 /* min. SCE bitrate where FB is supported in ISM format */
		#else
		#define MIN_BRATE_FB_ISM 24000 /* min. SCE bitrate where FB is supported in ISM format */
		#endif
		#endif

		#define MIN_TDM_BRATE_WB_TBE_1k05 12000 /* min. per channel bitrate where WB TBE @1.05 kbps is supported (0.35kbs at lower bitrates) */
		#define MIN_BRATE_WB_TBE_1k05 9650 /* min. per channel bitrate where WB TBE @1.05 kbps is supported (0.35kbs at lower bitrates) */
		@@ -1413,6 +1417,9 @@ typedef enum
		#ifdef FIX_563_PARAMMC_LIMITER
		#define PARAM_MC_ENER_LIMIT_MAX_DELTA_FAC (15.0f)
		#endif
		#ifdef FIX_580_PARAMMC_ENER_BURSTS
		#define PARAM_MC_NUM_ATTACK_ILD_THRESH (3)
		#endif
		#define PARAM_MC_LFE_ON_THRESH (8000.0f)
		#define PARAM_MC_BAND_TO_MDCT_BAND_RATIO 16 /* Ratio of resolution of CLDFB Bands to MDCT Bands */
		#define PARAM_MC_SLOT_ENC_NS 2500000L

lib_com/ivas_prot.h

+77 −53

Original line number	Diff line number	Diff line
		@@ -3848,7 +3848,7 @@ void calculate_hodirac_sector_parameters(
		void ivas_mc_paramupmix_enc(
		Encoder_Struct st_ivas, / i/o: IVAS Encoder handle */
		BSTR_ENC_HANDLE hMetaData, /* i/o: IVAS Metadata bitstream handle */
		float data_f[][L_FRAME48k], /* i/o: input: CICP6, CICP12, CICP14, CICP16 or CICP19 MC data */
		float data_f[][L_FRAME48k], /* i/o: input: MC data */
		const int16_t input_frame /* i : input frame length */
		);

		@@ -3941,7 +3941,7 @@ void ivas_param_mc_enc_close(
		void ivas_param_mc_enc(
		Encoder_Struct st_ivas, / i/o: IVAS Encoder handle */
		BSTR_ENC_HANDLE hMetaData, /* i/o: IVAS Metadata bitstream handle */
		float data_f[][L_FRAME48k], /* i/o: input: CICP6, CICP12, CICP14, CICP16 or CICP19 MC data */
		float data_f[][L_FRAME48k], /* i/o: input: MC data */
		const int16_t input_frame /* i : input frame length */
		);

		@@ -4542,9 +4542,11 @@ void ivas_get_spar_md_from_dirac(
		const int16_t active_w_vlbr
		);

		/! r: number of MD subframes /
		int16_t ivas_get_spar_dec_md_num_subframes(
		const int16_t sba_order, /* i : Ambisonic (SBA) order */
		const int32_t ivas_total_brate );
		const int32_t ivas_total_brate /* i : IVAS total bitrate */
		);

		ivas_error ivas_spar_md_dec_open(
		ivas_spar_md_dec_state_t *hMdDec_out, / i/o: SPAR MD decoder handle */
		@@ -4620,7 +4622,7 @@ ivas_error ivas_spar_covar_enc_open(
		ivas_filterbank_t pFb, / i/o: FB handle */
		const int32_t input_Fs, /* i : input sampling rate */
		const int16_t nchan_inp, /* i : number of input channels */
		COV_SMOOTHING_TYPE smooth_mode, /* i : Smooth covariance for SPAR or MC*/
		const COV_SMOOTHING_TYPE smooth_mode, /* i : Smooth covariance for SPAR or MC */
		const int32_t ivas_total_brate /* i : IVAS total bitrate */
		);

		@@ -5468,6 +5470,28 @@ void ivas_lfe_synth_with_filters(
		);


		#ifdef FIX_572_LFE_LPF_ENC
		/----------------------------------------------------------------------------------
		* LFE encoder low pass filter prototypes
		----------------------------------------------------------------------------------/

		ivas_error ivas_create_lfe_lpf_enc(
		ivas_filters_process_state_t *hLfeLpf, / o : LFE LPF handle */
		const int32_t input_Fs /* i : input sampling rate */
		);

		void ivas_lfe_lpf_enc_close(
		ivas_filters_process_state_t *hLfeLpf / i/o: LFE LPF handle */
		);

		void ivas_lfe_lpf_enc_apply(
		ivas_filters_process_state_t hLfeLpf, / i/o: LFE LPF handle */
		float data_lfe_ch[], /* i/o: LFE signal */
		const int16_t input_frame /* i : input frame length per channel */
		);
		#endif


		/----------------------------------------------------------------------------------
		* LFE Coding prototypes
		----------------------------------------------------------------------------------/

lib_com/ivas_rom_com.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -1803,7 +1803,6 @@ const int16_t param_mc_band_grouping_14[14 + 1] =
		0, 1, 2, 3, 4, 5, 6, 8, 10, 13, 16, 20, 28, 40, 60
		};


		const int16_t param_mc_coding_band_mapping_14[14] =
		{
		1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0