Merge branch 'main' into 744-fix-sofa-to-rom-tables-and-binaural-binary-files (ec3ff528) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+4 −0

Original line number	Diff line number	Diff line
		@@ -1106,6 +1106,9 @@ test-long-self-test:
		timeout: "50 minutes"
		rules:
		- if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'test-long-self-test'
		allow_failure:
		exit_codes:
		- 123
		script:
		- *print-common-info
		- *update-ltv-repo
		@@ -1148,6 +1151,7 @@ test-long-self-test:
		- zero_errors=$(cat report-junit-ltv.xml \| grep -c 'errors="0"') \|\| true

		- if [ $zero_errors != 1 ]; then echo "Run errors encountered!"; exit $EXIT_CODE_FAIL; fi
		- if [ $exit_code -eq 1 ]; then echo "Non-bitexact cases encountered!"; exit $EXIT_CODE_NON_BE; fi
		- exit 0

lib_com/ivas_prot.h

+22 −5

Original line number	Diff line number	Diff line
		@@ -4522,8 +4522,11 @@ void ivas_spar_update_md_hist(
		);

		int16_t ivas_spar_chk_zero_coefs(
		Decoder_Struct st_ivas, / i/o: IVAS decoder handle */
		Decoder_Struct st_ivas / i/o: IVAS decoder handle */
		#ifndef NONBE_FIX_698_SBA_MSAN
		,
		const int16_t sba_order /* i : Ambisonic (SBA) order */
		#endif
		);

		void ivas_spar_smooth_md_dtx(
		@@ -4929,9 +4932,7 @@ void ivas_copy_band_coeffs_idx_to_arr(

		void ivas_clear_band_coeffs(
		ivas_band_coeffs_t *pband_coeffs,
		const uint16_t num_bands,
		const uint16_t num_ts

		const uint16_t num_bands
		);

		void ivas_clear_band_coeff_idx(
		@@ -5295,6 +5296,18 @@ void ivas_mc2sba(
		const float gain_lfe /* i : gain for LFE, 0=ignore LFE */
		);

		#ifdef NONBE_FIX_727_MC_PARAMUPMIX_HEADROTATION
		void ivas_param_mc_mc2sba_cldfb(
		IVAS_OUTPUT_SETUP hTransSetup, /* i : transported MC Format */
		float hoa_encoder, / i : HOA3 encoder for the transported MC format */
		const int16_t slot_idx, /* i : current slot in the subframe */
		float Cldfb_RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i/o: Contains the MC signals (on input) and the HOA3 (on output) */
		float Cldfb_ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i/o: Contains the MC signals (on input) and the HOA3 (on output) */
		const int16_t nBands, /* i : number of synth CLDFB bands */
		const float gain_lfe /* i : gain applied to LFE */
		);
		#endif

		void ivas_ism2sba(
		float buffer_td[], / i/o: TD signal buffers */
		ISM_RENDERER_HANDLE hIsmRendererData, /* i/o: renderer data */
		@@ -5651,6 +5664,10 @@ void ivas_osba_enc(
		const ISM_MODE ism_mode, /* i : ISM mode */
		const int16_t sba_analysis_order, /* i : SBA order evaluated in DirAC/SPAR encoder */
		const int32_t input_Fs /* i : input sampling rate */
		#ifdef FIX_732_PLANAR_SBA_OSBA
		,
		const int16_t sba_planar /* i : planar SBA flag*/
		#endif
		);

		ivas_error ivas_masa_ism_data_open(

lib_com/ivas_rom_com.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -1464,9 +1464,7 @@ const int16_t pr_pd_idx_pairs[3][3][2] = { { { 1, 1 },{ 2, 2 },{ 3, 3 } },{ { 1,
		const int16_t remix_order_set[1][DIRAC_MAX_ANA_CHANS] = { /* WYZX --> WYXZ... */
		{ 0, 1, 3, 2, 4, 5, 6, 7, 8, 9, 10 }
		};
		#ifdef SPAR_HOA_DBG
		const int16_t keep_planar[IVAS_SPAR_MAX_CH - IVAS_SPAR_MAX_DMX_CHS] = { 1, 1, 1, 1, 1, 1 };
		#endif

		const int16_t HOA_keep_ind[IVAS_SPAR_MAX_FB_IN_CHAN] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 15};
		const int16_t HOA_keep_ind_spar[IVAS_SPAR_MAX_CH] = {0, 1, 2, 3, 4, 8, 9, 10, 10, 10, 10};
		const int16_t HOA_keep_ind_spar512[IVAS_SPAR_MAX_CH] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10};

lib_com/ivas_rom_com.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -180,9 +180,6 @@ extern const ivas_huff_models_t ivas_huff_drct_r_consts[TOTAL_DRCT_QUANT_STRATS]
		extern const ivas_huff_models_t ivas_huff_decd_r_consts[TOTAL_DECD_QUANT_STRATS];
		extern const ivas_spar_br_table_t ivas_spar_br_table_consts[IVAS_SPAR_BR_TABLE_LEN];
		extern const int16_t remix_order_set[1][DIRAC_MAX_ANA_CHANS];
		#ifdef SPAR_HOA_DBG
		extern const int16_t keep_planar[IVAS_SPAR_MAX_CH - FOA_CHANNELS];
		#endif
		extern const int16_t HOA_keep_ind[IVAS_SPAR_MAX_FB_IN_CHAN];
		extern const int16_t HOA_keep_ind_spar[IVAS_SPAR_MAX_CH];
		extern const int16_t HOA_keep_ind_spar512[IVAS_SPAR_MAX_CH];

lib_com/ivas_spar_com_quant_util.c

+9 −14

Original line number	Diff line number	Diff line
		@@ -293,23 +293,18 @@ void ivas_copy_band_coeffs_idx_to_arr(

		void ivas_clear_band_coeffs(
		ivas_band_coeffs_t *pband_coeffs,
		const uint16_t num_bands,
		const uint16_t num_ts )
		const uint16_t num_bands )
		{
		uint16_t i, j;
		uint16_t i;

		for ( j = 0; j < num_ts; j++ )
		{
		for ( i = 0; i < num_bands; i++ )
		{
		set_zero( (float ) pband_coeffs[i + j num_bands].C_re, ( IVAS_SPAR_MAX_CH - IVAS_SPAR_MAX_DMX_CHS ) * ( IVAS_SPAR_MAX_DMX_CHS - 1 ) );
		set_zero( (float ) pband_coeffs[i + j num_bands].P_re, ( IVAS_SPAR_MAX_CH - 1 ) );
		set_zero( (float ) pband_coeffs[i + j num_bands].C_quant_re, ( IVAS_SPAR_MAX_CH - IVAS_SPAR_MAX_DMX_CHS ) * ( IVAS_SPAR_MAX_DMX_CHS - 1 ) );
		set_zero( (float ) pband_coeffs[i + j num_bands].P_quant_re, ( IVAS_SPAR_MAX_CH - 1 ) );
		set_zero( pband_coeffs[i + j * num_bands].pred_re, ( IVAS_SPAR_MAX_CH - 1 ) );

		set_zero( pband_coeffs[i + j * num_bands].pred_quant_re, ( IVAS_SPAR_MAX_CH - 1 ) );
		}
		set_zero( (float ) pband_coeffs[i].C_re, ( IVAS_SPAR_MAX_CH - IVAS_SPAR_MAX_DMX_CHS ) ( IVAS_SPAR_MAX_DMX_CHS - 1 ) );
		set_zero( (float *) pband_coeffs[i].P_re, ( IVAS_SPAR_MAX_CH - 1 ) );
		set_zero( (float ) pband_coeffs[i].C_quant_re, ( IVAS_SPAR_MAX_CH - IVAS_SPAR_MAX_DMX_CHS ) ( IVAS_SPAR_MAX_DMX_CHS - 1 ) );
		set_zero( (float *) pband_coeffs[i].P_quant_re, ( IVAS_SPAR_MAX_CH - 1 ) );
		set_zero( pband_coeffs[i].pred_re, ( IVAS_SPAR_MAX_CH - 1 ) );
		set_zero( pband_coeffs[i].pred_quant_re, ( IVAS_SPAR_MAX_CH - 1 ) );
		}

		return;