Merge branch 'main' into 'philips/contribution-38-control-metadata-reverb' (23fae825) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_dirac_com.c

+16 −0

Original line number	Diff line number	Diff line
		@@ -111,12 +111,20 @@ ivas_error ivas_dirac_config(
		if ( ( (Encoder_Struct *) st_ivas )->hSpar != NULL )
		{
		hFbMdft = ( (Encoder_Struct *) st_ivas )->hSpar->hFbMixer;
		#ifdef FIX_613_DIRAC_NULL_PTR_USAN
		dirac_to_spar_md_bands = ( (Encoder_Struct *) st_ivas )->hSpar->dirac_to_spar_md_bands;
		#endif
		}
		else
		{
		hFbMdft = NULL;
		#ifdef FIX_613_DIRAC_NULL_PTR_USAN
		dirac_to_spar_md_bands = NULL;
		#endif
		}
		#ifndef FIX_613_DIRAC_NULL_PTR_USAN
		dirac_to_spar_md_bands = ( (Encoder_Struct *) st_ivas )->hSpar->dirac_to_spar_md_bands;
		#endif
		}
		else
		{
		@@ -131,13 +139,21 @@ ivas_error ivas_dirac_config(
		if ( ( (Decoder_Struct *) st_ivas )->hSpar != NULL )
		{
		hFbMdft = ( (Decoder_Struct *) st_ivas )->hSpar->hFbMixer;
		#ifdef FIX_613_DIRAC_NULL_PTR_USAN
		dirac_to_spar_md_bands = ( (Decoder_Struct *) st_ivas )->hSpar->dirac_to_spar_md_bands;
		#endif
		}
		else
		{
		hFbMdft = NULL;
		#ifdef FIX_613_DIRAC_NULL_PTR_USAN
		dirac_to_spar_md_bands = NULL;
		#endif
		}
		( (Decoder_Struct *) st_ivas )->hDirAC->hFbMdft = hFbMdft;
		#ifndef FIX_613_DIRAC_NULL_PTR_USAN
		dirac_to_spar_md_bands = ( (Decoder_Struct *) st_ivas )->hSpar->dirac_to_spar_md_bands;
		#endif
		}

		if ( ivas_format == SBA_FORMAT )

lib_com/ivas_prot.h

+24 −0

Original line number	Diff line number	Diff line
		@@ -4252,6 +4252,10 @@ void ivas_sba_mix_matrix_determiner(
		const int16_t bfi, /* i : BFI flag */
		const int16_t nchan_remapped, /* i : num channels after remapping of TCs */
		const int16_t output_frame /* i : output frame length */
		#ifdef VLBR_20MS_MD
		,
		const int16_t num_md_sub_frames /* i : number of subframes in mixing matrix */
		#endif
		);

		/* AGC */
		@@ -4554,7 +4558,23 @@ void ivas_get_spar_md_from_dirac(
		int16_t ivas_get_spar_dec_md_num_subframes(
		const int16_t sba_order, /* i : Ambisonic (SBA) order */
		const int32_t ivas_total_brate /* i : IVAS total bitrate */
		#ifdef VLBR_20MS_MD
		,
		const int32_t ivas_last_active_brate /* i : IVAS last active bitrate */
		#endif
		);
		#ifdef VLBR_20MS_MD

		ivas_error ivas_spar_md_dec_matrix_open(
		ivas_spar_md_dec_state_t hMdDec, / i/o: SPAR MD decoder handle */
		const int16_t num_channels, /* i : number of internal channels */
		const int16_t num_md_sub_frames );

		void ivas_spar_md_dec_matrix_close(
		ivas_spar_md_dec_state_t hMdDecoder, / i/o: SPAR MD decoder handle */
		const int16_t num_channels ); /* i : number of internal channels */

		#endif

		ivas_error ivas_spar_md_dec_open(
		ivas_spar_md_dec_state_t *hMdDec_out, / i/o: SPAR MD decoder handle */
		@@ -4562,6 +4582,10 @@ ivas_error ivas_spar_md_dec_open(
		const int16_t num_channels, /* i : number of internal channels */
		const int16_t sba_order, /* i : SBA order */
		const int16_t sid_format /* i : SID format */
		#ifdef VLBR_20MS_MD
		,
		const int32_t last_active_ivas_total_brate /* i : IVAS last active bitrate */
		#endif
		);

		void ivas_spar_md_dec_close(

lib_com/ivas_spar_com.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -1766,7 +1766,11 @@ void ivas_get_spar_md_from_dirac(
		{
		for ( band = start_band; band < end_band; band++ )
		{
		#ifdef FIX_615_UBSAN_SPAR_TO_DIRAC
		ndm = hSpar_md_cfg->num_dmx_chans_per_band[band];
		#else
		ndm = hSpar_md_cfg->num_dmx_chans_per_band[band - 1];
		#endif

		/SPAR from DirAC/
		set_f( response_avg, 0.0f, MAX_OUTPUT_CHANNELS );

lib_com/options.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -154,6 +154,7 @@
		#define CONTROL_METADATA_EARLY_REFLECTIONS /* Philips/Qualcomm: early reflections extension to reverb configuration */
		#define CONTROL_METADATA_DIRECTIVITY /* Ericsson: Directivity renderer configuration */
		#endif
		#define VLBR_20MS_MD /* Dlb: SBA VLBR 20ms Optimization*/
		#define SBA_MODE_CLEANUP_2 /* Dlb : changes part of fix issue #523 for unused signaling bit in SBA SID*/
		#define FIX_137_SID_MD_BITS /* Dlb: Fix issue #137 , SID bitrate mismatch correction */
		#define FIX_563_PARAMMC_LIMITER /* FhG: issue 563: fix ILD limiter when coming from silence w/o transient set */
		@@ -194,6 +195,7 @@
		#define JBM_PARAMUPMIX /* Dlb: Issue 471: Integrate the Multichannel Parametric Upmix into the JBM path */
		#define FIX_582_INDEX_OUT_OF_BOUNDS_SNS_AVQ_DEC /* FhG: fix an undefined behaviour error in SNS AVQ decoding */
		#define FIX_614_ADD_TO_NULL_PTR_DIRAC_SETUP /* FhG: Issue 614: prevent adding to a null pointer in dirac setup code */
		#define UPDATE_REVERB_UTILS /* Use CLDFB HRTFs of the appropriate SBA order in get_IR_from_filter_taps() */

		/* Fixes for bugs found during split rendering contribution development */
		#define REND_STATIC_MEM_OPT /* Dlb: Static memory optimisation for external renderer */
		@@ -208,6 +210,7 @@
		#define FIX_619_ADD_UNDEF_VAL_FOR_CONCEALMENT_MODE /* FhG: fix usan error */
		#define FIX_622_SILENCE_USAN_WARNING /* FhG: silenceusan warning in ifft code */

		#define FIX_615_UBSAN_SPAR_TO_DIRAC /Dlb : Fix for UBSAN issue 615/
		/* ################## End BE DEVELOPMENT switches ######################### */

lib_dec/ivas_dec.c

+15 −1

Original line number	Diff line number	Diff line
		@@ -71,6 +71,9 @@ ivas_error ivas_dec(
		float pan_left, pan_right;
		ivas_error error;
		float *p_output[MAX_OUTPUT_CHANNELS];
		#ifdef VLBR_20MS_MD
		int16_t num_md_sub_frames;
		#endif

		error = IVAS_ERR_OK;

		@@ -388,7 +391,12 @@ ivas_error ivas_dec(
		}

		ivas_spar_dec_gen_umx_mat( st_ivas->hSpar->hMdDec, st_ivas->nchan_transport, IVAS_MAX_NUM_BANDS, st_ivas->bfi,
		ivas_get_spar_dec_md_num_subframes( st_ivas->sba_order, st_ivas->hDecoderConfig->ivas_total_brate ) );
		ivas_get_spar_dec_md_num_subframes( st_ivas->sba_order, st_ivas->hDecoderConfig->ivas_total_brate
		#ifdef VLBR_20MS_MD
		,
		st_ivas->last_active_ivas_total_brate
		#endif
		) );
		}

		ivas_sba_dirac_stereo_dec( st_ivas, output, output_frame, st_ivas->ivas_format == MC_FORMAT );
		@@ -411,7 +419,13 @@ ivas_error ivas_dec(

		if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC \|\| st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM )
		{
		#ifdef VLBR_20MS_MD
		num_md_sub_frames = ivas_get_spar_dec_md_num_subframes( st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate,
		st_ivas->last_active_ivas_total_brate );
		ivas_sba_mix_matrix_determiner( st_ivas->hSpar, output, st_ivas->bfi, nchan_remapped, output_frame, num_md_sub_frames );
		#else
		ivas_sba_mix_matrix_determiner( st_ivas->hSpar, output, st_ivas->bfi, nchan_remapped, output_frame );
		#endif
		}
		else if ( st_ivas->renderer_type != RENDERER_DISABLE )
		{