port MR, part1 (ef7604b6) · Commits · SA4 / Audio / IVAS BASOP

lib_com/ivas_prot_fx.h

+31 −19

Original line number	Diff line number	Diff line
		@@ -2500,7 +2500,7 @@ Word16 ivas_sba_get_nchan_metadata_fx(
		);

		#ifdef NONBE_FIX_1052_SBA_EXT
		/! r: number of bits in SPAR SID frame /
		/! r: number of bits in SBQ SID frame /
		Word16 ivas_sba_spar_sid_bitlen_fx(
		const Word16 nchan_transport /* i : number of transport channels */
		);
		@@ -3499,7 +3499,9 @@ ivas_error ivas_qmetadata_enc_encode_hr_384_512_fx(
		BSTR_ENC_HANDLE hMetaData, /* i/o: metadata bitstream handle */
		IVAS_QMETADATA hQMetaData, / i/o: metadata handle */
		const Word16 bits_sph_idx,
		const Word16 bits_sp_coh );
		const Word16 bits_sp_coh
		);

		void ivas_merge_masa_metadata_fx(
		MASA_ENCODER_HANDLE hMasa, /* i/o: MASA enc handle. source for MASA metadata and combined metadata will be here */
		OMASA_SPATIAL_META_HANDLE hOMasaMeta /* i : ISM-object metadata to be merged with the MASA metadata */
		@@ -3519,14 +3521,16 @@ void ivas_param_mc_enc_fx(
		Encoder_Struct st_ivas, / i/o: IVAS Encoder handle */
		BSTR_ENC_HANDLE hMetaData, /* i/o: IVAS Metadata bitstream handle */
		Word32 data_f_fx[], / i/o: input/transport MC data Q11 */
		const Word16 input_frame /* i : input frame length */
		const Word1
		6 input_frame /* i : input frame length */
		);
		void ivas_merge_masa_transports_fx(
		Word32 data_in_f1_fx[][L_FRAME48k], // Qx
		Word32 *data_in_f2_fx[], // Qx
		Word32 *data_out_f_fx[], // Qx
		const Word16 input_frame,
		const Word16 num_transport_channels );
		const Word16 num_transport_channels
		);

		void ivas_param_mc_enc_close_fx(
		PARAM_MC_ENC_HANDLE hParamMC, / i/o: Parametric MC encoder handle */
		@@ -3625,11 +3629,18 @@ ivas_error ivas_masa_encode_fx(
		void ivas_write_format_sid_fx(
		const IVAS_FORMAT ivas_format, /* i : IVAS format */
		const Word16 element_mode, /* i : element bitrate */
		#ifdef NONBE_FIX_1052_SBA_EXT_FIX
		BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
		const Word16 sba_order, /* i : Ambisonic (SBA) order */
		const Word16 sba_planar /* i : SBA planar flag */
		#else
		BSTR_ENC_HANDLE hBstr /* i/o: encoder bitstream handle */
		#endif
		);

		void ivas_write_format_fx( /* i/o: IVAS encoder structure */
		Encoder_Struct *st_ivas );
		void ivas_write_format_fx(
		Encoder_Struct st_ivas / i/o: IVAS encoder structure */
		);

		ivas_error create_sce_enc_fx(
		Encoder_Struct st_ivas, / i/o: IVAS encoder structure */
		@@ -5850,7 +5861,8 @@ ivas_error ivas_dirac_enc_fx(
		const Word16 nchan_transport, /* i : number of transport channels */
		#endif
		const Word16 hodirac_flag, /* i : hodirac flag */
		const Word16 shift );
		const Word16 shift
		);

		ivas_error ivas_spar_md_enc_init_fx(
		ivas_spar_md_enc_state_t hMdEnc, / o : MD encoder handle */

lib_com/ivas_sba_config_fx.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -171,10 +171,10 @@ Word16 ivas_sba_get_nchan_fx(
		/-------------------------------------------------------------------
		* ivas_sba_spar_sid_bitlen_fx()
		*
		* Get number of bits in SPAR SID frame
		* Get number of bits in SBA SID frame
		-------------------------------------------------------------------/

		/! r: number of bits in SPAR SID frame /
		/! r: number of bits in SBA SID frame /
		Word16 ivas_sba_spar_sid_bitlen_fx(
		const Word16 nchan_transport /* i : number of transport channels */
		)
		@@ -191,6 +191,7 @@ Word16 ivas_sba_spar_sid_bitlen_fx(
		}
		#endif


		/-------------------------------------------------------------------
		* ivas_sba_get_nchan_metadata()
		*

lib_com/options.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -124,6 +124,7 @@
		#define NONBE_FIX_MC_LFE_LPF /* Dlb: Adding the LFE LPF filter back for MC content. */
		#define NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR /* Nok: issue 1074 fixing number of objects signaling in OMASA low rate */
		#define FIX_1222_OMASA_DEC_CHANNEL_BUFFERS /* VA: issue 1222: Reduction of the number of channel buffers in OMASA decoder */
		#define NONBE_FIX_1052_SBA_EXT_FIX /* VA: SBA external output support fix - do not overwrite "output_config" parameter */

		/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_dirac_dec_fx.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1292,6 +1292,7 @@ void ivas_dirac_dec_read_BS_fx(
		set32_fx( hQMetaData->q_direction[0].band_data[b].elevation_fx, 0, MAX_PARAM_SPATIAL_SUBFRAMES );
		}
		}

		#ifdef NONBE_FIX_1052_SBA_EXT
		nb_bits = add( nb_bits, ivas_qmetadata_dec_sid_decode( hQMetaData, st->bit_stream, &( st->next_bit_pos ), nchan_transport, NULL, SBA_FORMAT ) );
		move16();
		@@ -1393,6 +1394,7 @@ void ivas_dirac_dec_read_BS_fx(
		nb_bits = add( nb_bits, ivas_qmetadata_dec_sid_decode( hQMetaData, st->bit_stream, &( st->next_bit_pos ), 0, NULL, SBA_FORMAT ) );
		move16();
		#endif

		FOR( i = 0; i < MAX_PARAM_SPATIAL_SUBFRAMES; i++ )
		{
		hQMetaData->q_direction[0].band_data[orig_dirac_bands - 1].azimuth_fx[i] = hQMetaData->q_direction[0].band_data[1].azimuth_fx[0];

lib_dec/ivas_init_dec_fx.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -1076,6 +1076,7 @@ static ivas_error ivas_read_format(
		num_bits_read = add( num_bits_read, SBA_ORDER_BITS );
		move16();
		#endif

		if ( st_ivas->sba_analysis_order == 0 )
		{
		st_ivas->sba_analysis_order = SBA_FOA_ORDER;