port MR 1318 from float (3ffe9407) · Commits · SA4 / Audio / IVAS BASOP

lib_com/ivas_prot.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -3719,6 +3719,9 @@ void generate_masking_noise_lb_dirac(
		HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables */
		float tdBuffer, / i/o: time-domain signal, if NULL no LB-CNA */
		const int16_t nCldfbTs, /* i : number of CLDFB slots that will be rendered */
		#ifdef NONBE_FIX_951_MCMASA_5MS_RENDERING
		SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom, /* i : common spatial rendering parameters handle */
		#endif
		const int16_t cna_flag /* i : CNA flag for LB and HB */
		);

lib_com/options.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -189,6 +189,8 @@
		#define NONBE_FIX_935_SBA_REVERB /* FhG: issue 935: fix MSAN error for SBA related to BINAURAL_ROOM_REVERB */
		#define FIX_969_USAN_IGF_ARITH /* FhG: issue 969: fix USAN error in igf_sce_dec; same issue as #962 */
		#define FIX_959_MASA_LINEAR_REND /* VA: issue 959: remove unused calling of ivas_sba_linear_renderer() in MASA rendering */
		#define NONBE_FIX_951_MCMASA_5MS_RENDERING /* Nokia: issue #951: Differences for 5ms and 20ms rendering for McMASA at 13.2 kbps to BINAURAL */


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

lib_dec/fd_cng_dec.c

+34 −2

Original line number	Diff line number	Diff line
		@@ -1805,6 +1805,9 @@ void generate_masking_noise_lb_dirac(
		HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables */
		float tdBuffer, / i/o: time-domain signal, if NULL no LB-CNA */
		const int16_t nCldfbTs, /* i : number of CLDFB slots that will be rendered */
		#ifdef NONBE_FIX_951_MCMASA_5MS_RENDERING
		SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom, /* i : common spatial rendering parameters handle */
		#endif
		const int16_t cna_flag /* i : CNA flag for LB and HB */
		)
		{
		@@ -1857,6 +1860,12 @@ void generate_masking_noise_lb_dirac(
		/* LB CLDFB - CNA from STFT: CNA applied only in channel 0*/
		if ( cna_flag && tdBuffer != NULL )
		{
		#ifdef NONBE_FIX_951_MCMASA_5MS_RENDERING
		int16_t cur_subframe;
		int16_t cur_subframe_start_outfs;
		int16_t cur_subframe_start_cngfs;
		int16_t slot_size_cng;
		#endif
		while ( n_samples_out > 0 )
		{
		n_samples_out_loop = min( hFdCngCom->frameSize, n_samples_out );
		@@ -1940,6 +1949,29 @@ void generate_masking_noise_lb_dirac(
		n_samples_out -= hFdCngCom->frameSize;
		n_samples_start += hFdCngCom->frameSize;
		}

		#ifdef NONBE_FIX_951_MCMASA_5MS_RENDERING
		/* move generated noise to the 5ms subframe starts in the tc buffer according to the output sampling frequency to avoid
		overwriting it with the synthesis in case of shared tc and synth channel memory, i.e. non-TSM mode */
		slot_size_cng = hFdCngCom->frameSize / DEFAULT_JBM_CLDFB_TIMESLOTS;
		/* move start indices forward to the end of the last subframe */
		cur_subframe_start_outfs = nCldfbTs * hSpatParamRendCom->slot_size;
		cur_subframe_start_cngfs = nCldfbTs * slot_size_cng;

		/* go from the last subframe back and move the LB noise */
		for ( cur_subframe = hSpatParamRendCom->nb_subframes - 1; cur_subframe >= 0; cur_subframe-- )
		{
		int16_t move_size, subframe_size_outfs;
		move_size = slot_size_cng * hSpatParamRendCom->subframe_nbslots[cur_subframe];
		subframe_size_outfs = hSpatParamRendCom->subframe_nbslots[cur_subframe] * hSpatParamRendCom->slot_size;
		cur_subframe_start_outfs -= hSpatParamRendCom->subframe_nbslots[cur_subframe] * hSpatParamRendCom->slot_size;
		cur_subframe_start_cngfs -= hSpatParamRendCom->subframe_nbslots[cur_subframe] * slot_size_cng;
		/* move cna */
		mvr2r( tdBuffer + cur_subframe_start_cngfs, tdBuffer + cur_subframe_start_outfs, move_size );
		/* set everything else to zero */
		set_zero( tdBuffer + cur_subframe_start_outfs + move_size, subframe_size_outfs - move_size );
		}
		#endif
		}

		pop_wmops();

lib_dec/ivas_dirac_dec.c

+10 −2

Original line number	Diff line number	Diff line
		@@ -1952,10 +1952,18 @@ void ivas_dirac_dec_render_sf(

		generate_masking_noise_dirac( st->hFdCngDec->hFdCngCom,
		st_ivas->cldfbAnaDec[1],
		#ifdef NONBE_FIX_951_MCMASA_5MS_RENDERING
		&st_ivas->hTcBuffer->tc[1][hSpatParamRendCom->num_freq_bands * hSpatParamRendCom->slots_rendered],
		#else
		st_ivas->hTcBuffer->tc[1],
		#endif
		Cldfb_RealBuffer[1][0],
		Cldfb_ImagBuffer[1][0],
		#ifdef NONBE_FIX_951_MCMASA_5MS_RENDERING
		slot_idx,
		#else
		index_slot,
		#endif
		st->cna_dirac_flag && st->flag_cna,
		( st->core_brate == FRAME_NO_DATA \|\| st->core_brate == SID_2k40 ) && st->cng_type == FD_CNG && st->cng_sba_flag );
		}

lib_dec/ivas_sba_dec.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -762,7 +762,11 @@ void ivas_sba_dec_digest_tc(
		( ( st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC \|\| st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM \|\| st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC ) && ( nchan_transport == 1 && st_ivas->nchan_transport != 2 && st_ivas->hSCE[0]->hCoreCoder[0] != NULL && st_ivas->hSCE[0]->hCoreCoder[0]->cng_sba_flag ) ) )
		{
		Decoder_State *st = st_ivas->hSCE[0]->hCoreCoder[0];
		#ifdef NONBE_FIX_951_MCMASA_5MS_RENDERING
		generate_masking_noise_lb_dirac( st->hFdCngDec->hFdCngCom, st_ivas->hTcBuffer->tc[1], nCldfbSlots, st_ivas->hSpatParamRendCom, st->cna_dirac_flag && st->flag_cna );
		#else
		generate_masking_noise_lb_dirac( st->hFdCngDec->hFdCngCom, st_ivas->hTcBuffer->tc[1], nCldfbSlots, st->cna_dirac_flag && st->flag_cna );
		#endif
		}

		return;