Merge branch 'main' into '571-reverb-not-activated-for-discrete-and-parametric-ism' (06c551b9) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+7 −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

lib_com/ivas_prot.h

+77 −53

Original line number	Diff line number	Diff line
		@@ -3844,7 +3844,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 */
		);

		@@ -3921,7 +3921,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 */
		);

		@@ -4522,9 +4522,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 */
		@@ -4600,7 +4602,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 */
		);

		@@ -5448,6 +5450,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/options.h

+7 −3

Original line number	Diff line number	Diff line
		@@ -99,7 +99,7 @@
		/MCT Debug switches/
		/#define DEBUG_FORCE_MCT_CP/ /* force MCT Stereo pairs for verification with SPAR */
		#ifdef DEBUG_FORCE_MCT_CP
		/#define DEBUG_SINGLE_CODE_OMNI/ /* force 3 TC SBA always code W channel seperately */
		/#define DEBUG_SINGLE_CODE_OMNI/ /* force 3 TC SBA always code W channel separately */
		#endif

		/PLC Debug switches/
		@@ -125,7 +125,7 @@
		#endif
		/#define SPAR_HOA_DBG/ /* SPAR HOA debug statements */
		/#define DEBUG_BINAURAL_FILTER_DESIGN/ /* debugging of Crend binaural filter design */
		//#define DEBUG_AGC_ENCODER_CMD_OPTION /* Ability to force enable or disable AGC behaviour in DIRAC/SPAR via command line option */
		/#define DEBUG_AGC_ENCODER_CMD_OPTION/ /* Ability to force enable or disable AGC behaviour in DIRAC/SPAR via command line option */
		#define DEBUG_JBM_CMD_OPTION /* ability for telling the decoder the frontend fetch size and to not delay compensate for bad frames at the beginning */

		#define VARIABLE_SPEED_DECODING /* variable speed decoding employing the JBM functioniality; move to DEBUGGING after build for disabled is fixed */
		@@ -153,8 +153,12 @@
		#define FIX_562_ISM2_64KBPS /* VA: issue 562: fix ISM2 at 64kbps issue */
		#define FIX_559_EXTL_IGF_MISMATCH /* VA: issue 559: fix mismatch between st->extl and st->igf observed as crash in PlanarSBA bitrate switching */
		#define FIX_571_REVERB_NOT_ACTIVATED_ISM /* Philips: Issue 571: Reverb not activated for discrete and parametric ISM */

		#define FIX_572_LFE_LPF_ENC /* FhG: issue 572: always apply the low pass filter to the LFE channel */
		#define FIX_QMETA_SID_5k2 /* Nokia: Issue 137: enable using full 5.2k bitrate in MASA SID */
		#define FIX_578_PARAMMC_ILD_BS /* FhG: Issue 578: transmitt also center ILD in band 0 when LFE is active in 3TC ParamMC */
		#define FIX_UNCLR_ISSUE /* VoiceAge: issue 574: Fix UNCLR mis-classifications in noisy speech stereo */
		#define FIX_TCX_LOWRATE_LIMITATION /* VA: issue 577: TCX bitrate limitation only when DEBUGGING is active */


		/* ################## End DEVELOPMENT switches ######################### */
		/* clang-format on */

lib_dec/dec_tcx.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -1592,8 +1592,7 @@ void decoder_tcx_imdct(
		hTcxCfg->tcx_last_overlap_mode = hTcxCfg->tcx_curr_overlap_mode;
		}

		if (
		st->igf )
		if ( st->igf )
		{
		proc = st->hIGFDec->flatteningTrigger;

lib_dec/ivas_cpe_dec.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -828,7 +828,6 @@ void destroy_cpe_dec(
		int16_t n;
		Decoder_State *st;


		for ( n = 0; n < CPE_CHANNELS; n++ )
		{
		st = hCPE->hCoreCoder[n];
		@@ -929,7 +928,6 @@ static void read_stereo_mode_and_bwidth(

		if ( st_ivas->bfi \|\| st_ivas->hDecoderConfig->ivas_total_brate < IVAS_SID_5k2 )
		{

		hCPE->element_mode = hCPE->last_element_mode;
		}