- Merge remote-tracking branch 'remotes/origin/main' into... (927968d9) · Commits · SA4 / Audio / IVAS BASOP

lib_com/gs_noisefill_fx.c

+12 −0

Original line number	Diff line number	Diff line
		@@ -751,11 +751,19 @@ void highband_exc_dct_in_fx(
		test();
		IF( bfi \|\| LT_32( core_brate, 6000 ) \|\| ( LT_32( core_brate, 8600 ) && EQ_16( coder_type, UNVOICED ) ) )
		{
		#ifndef FIX_1478_UNINIT_ON_BFI
		set16_fx( noisepb, 13107, MBANDS_GN ); /0.4 in Q15 /
		#else
		set16_fx( noisepb, 13107, last_bin ); /0.4 in Q15 /
		#endif
		}
		ELSE IF( EQ_16( GSC_IVAS_mode, 3 ) \|\| ( GSC_IVAS_mode > 0 && EQ_16( GSC_noisy_speech, 1 ) ) )
		{
		#ifndef FIX_1478_UNINIT_ON_BFI
		set16_fx( noisepb, 13107 /0.4f/, MBANDS_GN16k );
		#else
		set16_fx( noisepb, 13107 /0.4f/, last_bin );
		#endif
		}
		ELSE
		{
		@@ -772,7 +780,11 @@ void highband_exc_dct_in_fx(
		test();
		IF( GSC_IVAS_mode == 0 && GSC_noisy_speech && !bfi && LE_16( element_mode, IVAS_SCE ) )
		{
		#ifndef FIX_1478_UNINIT_ON_BFI
		set16_fx( noisepb, 3277, MBANDS_GN );
		#else
		set16_fx( noisepb, 3277, last_bin );
		#endif
		}
		test();
		IF( LT_32( core_brate, 6000 ) && LE_16( coder_type, UNVOICED ) )

lib_com/ifft_rel_fx.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -139,7 +139,12 @@ void ifft_rel_fx(
		/Can be acheived with a shr /
		step = idiv1616( N_MAX_SAS, n2 );
		move16();

		#ifdef FIX_2268_OOB_INDEXING_IN_IFFT
		IF( LT_16( n8, 2 ) )
		{
		continue;
		}
		#endif
		s = sincos_t_fx + step; /Q15 /
		c = s + 64; /Q15 /
		s3 = sincos_t_fx + i_mult2( step, 3 ); /Q15 /

lib_com/ivas_cnst.h

+5 −5

Original line number	Diff line number	Diff line
		@@ -186,12 +186,12 @@ typedef enum
		#define IVAS_NUM_SUPPORTED_FS 3 /* number of supported sampling-rates in IVAS */

		#define CLDFB_SLOT_NS 1250000L /* 1.25ms: CLDFB slot length */
		#define MAX_JBM_SUBFRAMES_5MS 8
		#define DEFAULT_JBM_SUBFRAMES_5MS 4
		#define JBM_CLDFB_SLOTS_IN_SUBFRAME 4
		#define DEFAULT_JBM_SUBFRAMES_5MS 4 /* == IVAS_MAX_PARAM_SPATIAL_SUBFRAMES */
		#define MAX_JBM_SUBFRAMES_5MS ( DEFAULT_JBM_SUBFRAMES_5MS * 2 )
		#define JBM_CLDFB_SLOTS_IN_SUBFRAME 4 /* == IVAS_MAX_PARAM_SPATIAL_SUBFRAMES */
		#define JBM_CLDFB_SLOTS_IN_SUBFRAME_LOG2 2 /* To be used for shift operation instead of division */
		#define MAX_JBM_CLDFB_TIMESLOTS 32
		#define DEFAULT_JBM_CLDFB_TIMESLOTS 16
		#define DEFAULT_JBM_CLDFB_TIMESLOTS CLDFB_NO_COL_MAX
		#define MAX_JBM_CLDFB_TIMESLOTS ( DEFAULT_JBM_CLDFB_TIMESLOTS * 2 )
		#define MAX_JBM_L_FRAME48k ( IVAS_MAX_FRAME_SIZE * 2 ) /* 1920: max. time-scaled frame buffer length (per channel) in samples */
		#define MAX_JBM_L_FRAME_NS 40000000L /* 40 ms: time-scaled frame size in ns, proportional to MAX_JBM_L_FRAME48k */
		#define MAX_SPAR_INTERNAL_CHANNELS IVAS_SPAR_MAX_CH

lib_com/ivas_prot_fx.h

+45 −50

Original line number	Diff line number	Diff line
		@@ -622,12 +622,6 @@ void ivas_dirac_dec_set_md_map_fx(
		const Word16 nCldfbTs /* i : number of CLDFB time slots */
		);

		void ivas_jbm_dec_get_adapted_subframes_fx(
		const Word16 nCldfbTs, /* i : number of time slots in the current frame */
		Word16 subframe_nbslots, / i/o: subframe grid */
		Word16 nb_subframes / i/o: number of subframes in the frame */
		);

		/! r: number of bits read /
		Word16 read_GR0(
		const UWord16 bit_stream, / i : bitstream to be read */
		@@ -1039,7 +1033,7 @@ void ivas_ism_render_sf_fx(
		const Word16 n_samples_to_render /* i : output frame length per channel */
		);

		void ivas_omasa_separate_object_render_jbm_fx(
		void ivas_omasa_separate_object_render_fx(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		const UWord16 nSamplesRendered, /* i : number of samples rendered */
		Word32 input_fx_in[][L_FRAME48k], /* i : separated object signal */
		@@ -2447,7 +2441,7 @@ void ivas_fb_mixer_cross_fading_fx(
		const Word16 cf_offset
		);

		ivas_error ivas_omasa_dirac_td_binaural_jbm_fx(
		ivas_error ivas_omasa_dirac_td_binaural_fx(
		Decoder_Struct st_ivas, / i/o: IVAS decoder handle */
		const UWord16 nSamplesAsked, /* i : number of samples requested */
		UWord16 nSamplesRendered, / o : number of samples rendered */
		@@ -2484,7 +2478,7 @@ void ivas_sba_get_spar_hoa_md_flag_fx(
		Word16 *spar_hoa_dirac2spar_md_flag
		);

		void ivas_omasa_dirac_rend_jbm_fx(
		void ivas_omasa_dirac_rend_fx(
		Decoder_Struct st_ivas, / i/o: IVAS decoder handle */
		const UWord16 nSamplesAsked, /* i : number of samples requested */
		UWord16 nSamplesRendered, / o : number of samples rendered */
		@@ -3846,7 +3840,7 @@ ivas_error ivas_osba_data_open_fx(
		Decoder_Struct st_ivas / i/o: IVAS decoder handle */
		);

		ivas_error ivas_osba_dirac_td_binaural_jbm_fx(
		ivas_error ivas_osba_dirac_td_binaural_fx(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		const UWord16 nSamplesAsked, /* i : number of CLDFB slots requested */
		UWord16 nSamplesRendered, / o : number of CLDFB slots rendered */
		@@ -5873,12 +5867,6 @@ ivas_error ivas_compute_core_buffers_fx(
		Word16 *Q_new
		);

		ivas_error ivas_enc_fx(
		Encoder_Struct st_ivas, / i/o: IVAS encoder structure */
		const Word16 data, / i : input signal Q0 */
		const Word16 n_samples /* i : number of input samples */
		);

		void reset_metadata_spatial_fx(
		const IVAS_FORMAT ivas_format, /* i : IVAS format */
		BSTR_ENC_HANDLE hMetaData, /* i/o: Metadata bitstream handle */
		@@ -5929,6 +5917,24 @@ void modify_Rmat_q_fx(
		* General IVAS prototypes
		----------------------------------------------------------------------------------/

		ivas_error ivas_enc_fx(
		Encoder_Struct st_ivas, / i/o: IVAS encoder structure */
		const Word16 data, / i : input signal Q0 */
		const Word16 n_samples /* i : number of input samples */
		);

		ivas_error ivas_dec_fx(
		Decoder_Struct st_ivas / i/o: IVAS decoder structure */
		);

		ivas_error ivas_dec_render_fx(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		const UWord16 nSamplesAsked, /* i : number of samples wanted */
		UWord16 nSamplesRendered, / o : number of samples rendered */
		UWord16 nSamplesAvailableNext, / o : number of samples still available in the rendering pipeline */
		Word16 data / o : output synthesis signal */
		);

		void copy_encoder_config_ivas_fx(
		Encoder_Struct st_ivas, / i : IVAS encoder structure */
		Encoder_State st, / o : encoder state structure */
		@@ -6134,21 +6140,9 @@ Word16 is_DTXrate(


		/----------------------------------------------------------------------------------
		* JBM prototypes
		* Internal rendering prototypes
		----------------------------------------------------------------------------------/

		ivas_error ivas_jbm_dec_tc_fx(
		Decoder_Struct st_ivas / i/o: IVAS decoder structure */
		);

		ivas_error ivas_jbm_dec_render_fx(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		const UWord16 nSamplesAsked, /* i : number of samples wanted */
		UWord16 nSamplesRendered, / o : number of samples rendered */
		UWord16 nSamplesAvailableNext, / o : number of samples still available in the rendering pipeline */
		Word16 data / o : output synthesis signal */
		);

		ivas_error ivas_jbm_dec_flush_renderer_fx(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		const Word16 tc_granularity_new, /* i : new renderer granularity */
		@@ -6161,7 +6155,7 @@ ivas_error ivas_jbm_dec_flush_renderer_fx(
		Word16 data / o : output synthesis signal */
		);

		void ivas_jbm_dec_feed_tc_to_renderer_fx(
		void ivas_dec_feed_tc_to_renderer_fx(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		const Word16 nSamplesForRendering, /* i : number of TC samples available for rendering */
		Word16 nSamplesResidual / o : number of samples not fitting into the renderer grid and buffer for the next call*/
		@@ -6175,80 +6169,80 @@ ivas_error ivas_jbm_dec_set_discard_samples_fx(
		Decoder_Struct st_ivas / i/o: main IVAS decoder structre */
		);

		void ivas_jbm_dec_get_adapted_linear_interpolator_fx(
		void ivas_dec_get_adapted_linear_interpolator_fx(
		const Word16 default_interp_length, /* i : default length of the (full-frame) interpolator */
		const Word16 interp_length, /* i : length of the interpolator to be created */
		Word16 interpolator_fx / o : the interpolator */
		);

		void ivas_jbm_dec_get_adapted_subframes(
		void ivas_dec_get_adapted_subframes_fx(
		const Word16 nCldfbTs, /* i : number of time slots in the current frame */
		Word16 subframe_nbslots, / i/o: subframe grid */
		Word16 nb_subframes / i/o: number of subframes in the frame */
		);

		void ivas_jbm_dec_get_md_map(
		void ivas_dec_get_md_map_fx(
		const Word16 default_len, /* i : default frame length in metadata slots */
		const Word16 len, /* i : length of the modfied frames in metadata slots */
		const Word16 subframe_len, /* i : default length of a subframe */
		const Word16 offset, /* i : current read offset into the md buffer */
		const Word16 offset, /* i : current read offset into the MD buffer */
		const Word16 buf_len, /* i : length of the metadata buffer */
		Word16 map / o : metadata index map */
		);

		Word16 ivas_jbm_dec_get_num_tc_channels_fx(
		Word16 ivas_dec_get_num_tc_channels_fx(
		Decoder_Struct st_ivas / i : IVAS decoder handle */
		);

		void ivas_jbm_dec_get_md_map_even_spacing(
		void ivas_dec_get_md_map_even_spacing_fx(
		const Word16 len, /* i : length of the modfied frames in metadata slots */
		const Word16 subframe_len, /* i : default length of a subframe */
		const Word16 offset, /* i : current read offset into the md buffer */
		const Word16 offset, /* i : current read offset into the MD buffer */
		const Word16 buf_len, /* i : length of the metadata buffer */
		Word16 map / o : metadata index map */
		);

		TC_BUFFER_MODE ivas_jbm_dec_get_tc_buffer_mode_fx(
		TC_BUFFER_MODE ivas_dec_get_tc_buffer_mode_fx(
		Decoder_Struct st_ivas / i : IVAS decoder handle */
		);

		Word16 ivas_jbm_dec_get_render_granularity_fx(
		Word16 ivas_dec_get_render_granularity_fx(
		const RENDERER_TYPE renderer_type, /* i : renderer type */
		const RENDERER_TYPE renderer_type_sec, /* i : secondary renderer type */
		const Word32 output_Fs /* i : sampling rate */
		);

		ivas_error ivas_jbm_dec_tc_buffer_open_fx(
		ivas_error ivas_dec_tc_buffer_open_fx(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		const TC_BUFFER_MODE tc_buffer_mode, /* i : buffer mode */
		const Word16 nchan_transport_jbm, /* i : number of real transport channels */
		const Word16 nchan_transport_rend, /* i : number of TCs for rendering */
		const Word16 nchan_transport_internal, /* i : number of totally buffered channels */
		const Word16 nchan_full, /* i : number of channels to fully store */
		const Word16 n_samples_granularity /* i : granularity of the renderer/buffer */
		);

		ivas_error ivas_jbm_dec_tc_buffer_reconfigure_fx(
		ivas_error ivas_dec_tc_buffer_reconfigure_fx(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		const TC_BUFFER_MODE tc_buffer_mode, /* i : new buffer mode */
		const Word16 nchan_transport_jbm, /* i : new number of real transport channels */
		const Word16 nchan_transport_rend, /* i : new number of TCs for rendering */
		const Word16 nchan_transport_internal, /* i : new number of totally buffered channels */
		const Word16 nchan_full, /* i : new number of channels to fully store */
		const Word16 n_samples_granularity /* i : new granularity of the renderer/buffer */
		);

		void ivas_jbm_dec_tc_buffer_close_fx(
		void ivas_dec_tc_buffer_close_fx(
		DECODER_TC_BUFFER_HANDLE phTcBuffer / i/o: TC buffer handle */
		);

		void ivas_jbm_dec_td_renderers_adapt_subframes(
		void ivas_dec_td_renderers_adapt_subframes_fx(
		Decoder_Struct st_ivas / i/o: IVAS decoder structure */
		);

		ivas_error ivas_jbm_dec_metadata_open(
		ivas_error ivas_jbm_dec_masa_metadata_open_fx(
		Decoder_Struct st_ivas / i/o: IVAS decoder structure */
		);

		void ivas_jbm_masa_sf_to_sf_map(
		void ivas_jbm_masa_sf_to_sf_map_fx(
		Decoder_Struct st_ivas / i/o: IVAS decoder structure */
		);

		@@ -6809,11 +6803,12 @@ void ivas_filters_init_fx(
		const Word16 order
		);


		/----------------------------------------------------------------------------------
		* OSBA prototypes
		----------------------------------------------------------------------------------/

		ivas_error ivas_osba_enc_reconfig(
		ivas_error ivas_osba_enc_reconfig_fx(
		Encoder_Struct st_ivas / i/o: IVAS encoder structure */
		);

		@@ -6830,11 +6825,11 @@ void ivas_set_surplus_brate_dec(
		Word32 ism_total_brate / i : ISM total bitrate */
		);

		ivas_error ivas_omasa_separate_object_renderer_open(
		ivas_error ivas_omasa_separate_object_renderer_open_fx(
		Decoder_Struct st_ivas / i/o: IVAS decoder structure */
		);

		void ivas_omasa_separate_object_renderer_close(
		void ivas_omasa_separate_object_renderer_close_fx(
		Decoder_Struct st_ivas / i/o: IVAS decoder structure */
		);

lib_com/options.h

+4 −2

Original line number	Diff line number	Diff line
		@@ -84,6 +84,7 @@
		#define FIX_1990_SANITIZER_IN_REVERB_LOAD /* Nokia: Fix issue part of issue 1990 by introducing missing free of structure - keep until #2059 is addressed */
		#define FIX_1999_TEMPORARY_DISABLE_DIST_ATT_CHECK /* Eri: Issue 1999: Range check on float values of distance attenuation, while the float values are not propagated to this function. The test is not correct, but configurable distance attenuation is not used in Characterization.*/
		#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */
		#define FIX_1466_EXTREND /* FhG: float issue 1466: enable rendering of mono/stereo to other formats in the external renderer */
		#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR. */
		#define FIX_1435_MOVE_STEREO_PANNING /* VA: issue 1435: do the EVS stereo panning in the renderer */
		#define FIX_2252_SCALING_SAVE_HB_SYNTH /* VA: issue 2252: fix use-of-uninit-value in save_hb_synth_fx[] scaling in FOA decoding with bitstream that starts with an SID */
		@@ -101,9 +102,12 @@
		#define FIX_2278_OOB_INDEXING_IN_CLOSED_LOOP_PIT_SEARCH /* FhG: fix oob indexing USAN complaint */
		#define FIX_2287_MCT_MDCT_STEREO_DATA_MALLOC_SIZE /* FhG: correct allocation size for STEREO_MDCT_DEC_DATA struct */
		#define FIX_1904_HARM_GSC_ENC /* VA: #1904 Harmonization of EVS and IVAS GSC code */
		#define FIX_2268_OOB_INDEXING_IN_IFFT /* VA: Fix for issue 2268, to silence clang18 */
		#define FIX_2271_OOB_INDEXING_IN_PIT_OL2 /* VA: Fix for issue 2271, to silence clang18 */
		#define FIX_2273_OOB_INDEXING_IN_PIT_FR4 /* VA: Fix to silence clang on ptr init */
		#define FIX_1449_RENDERER_FRAME_SIZE_UNCLEAR_IN_ISAR /* Dolby: Fix for issue 1449: renderer frame size unclear in ISAR */
		#define FIX_1872_REMOVE_UNUSED_PSNOISEGEN_ISAR /* Dolby: Remove unused psNoiseGen from ISAR */
		#define FIX_1478_UNINIT_ON_BFI /* VA: Fix issue 1478 where a vector is partly un-initialized during bfi */
		#define FIX_1487_ACCESS_OF_UNINIT_VAL_FROM_ARR_ISM_DTX /* FhG/VA: init nb_bits_metadata to zero */

		/* #################### End BE switches ################################## */
		@@ -118,10 +122,8 @@
		#define FIX_2250_LARGE_DIFFERENCES_BETWEEN_BASOP_AND_FLOAT /* Dolby: Issue 2250: random vector generation in GenShapedSHBExcitation() */
		#define FIX_2254_IMPROV_PRECISION_OR_COMPLEXITY_NON_BE /* VA: Precision improvement without increasing complexity, or complexity reduction that might be not BE on the LSB */
		#define FIX_2252_LP_CNG_STARTS_SID /* VA: issues 2251 and 2252: fix LP CNG uninitialized value in bitstream that starts with an SID */
		#define FIX_1466_EXTREND /* FhG: float issue 1466: enable rendering of mono/stereo to other formats in the external renderer */
		#define FIX_1381_BWD /* VA: issue 1381: apply no hysteresis in BWD at higher bitrates also in mono MASA and OMASA */
		#define FIX_2285_CODE_DECODER_INIT_BW /* VA: basop issue 2285: fix core-decoder initialization bandwidth */
		#define FIX_1872_REMOVE_UNUSED_PSNOISEGEN_ISAR /* Dolby: Remove unused psNoiseGen from ISAR */

		/* ##################### End NON-BE switches ########################### */