Merge branch 'main' into 1785-10ms_Rendering_Assert_in_ivas_jbm_dec_render_fx()_scale_sig32 (4241732e) · Commits · SA4 / Audio / IVAS BASOP

lib_com/cnst.h

+6 −2

Original line number	Diff line number	Diff line
		@@ -799,8 +799,12 @@ enum
		#define CLDFB_NO_COL_MAX_SWITCH 6 /* CLDFB resampling - max number of CLDFB col. for switching */
		#define CLDFB_NO_COL_MAX_SWITCH_BFI 10 /* CLDFB resampling - max number of CLDFB col. for switching, BFI */
		#define CLDFB_OVRLP_MIN_SLOTS 3 /* CLDFB resampling - minimize processing to minimum required for transition frame ACELP->TCX/HQ */

		#ifndef FIX_2085_FLOATING_POINT_LEFTOVERS
		#define INV_CLDFB_BANDWIDTH ( 1.f / 800.f )
		#define INV_CLDFB_BANDWIDTH_Q31 ( 2684355l )
		#endif

		#define INV_CLDFB_BANDWIDTH_Q31 ( 2684355l ) /* ( 1.f / 800.f ) Q31 */
		#define INV_CLDFB_BANDWIDTH_MDFT_FAC_Q31 ( 10737418 )
		#define CLDFB_BANDWIDTH 800

lib_com/ivas_dirac_com_fx.c

+12 −0

Original line number	Diff line number	Diff line
		@@ -218,6 +218,17 @@ ivas_error ivas_dirac_config_fx(
		}

		test();
		#ifdef FIX_2085_FLOATING_POINT_LEFTOVERS
		IF( EQ_32( ivas_format, SBA_FORMAT ) \|\| EQ_32( ivas_format, SBA_ISM_FORMAT ) )
		{
		// 100861_dirac_dec
		ivas_dirac_config_bands_fx( band_grouping, IVAS_MAX_NUM_BANDS, extract_l( Mpy_32_32_r( Fs, INV_CLDFB_BANDWIDTH_Q31 ) ), dirac_to_spar_md_bands, hQMetaData->useLowerBandRes, hConfig->enc_param_start_band, hFbMdft, 1 );
		}
		ELSE
		{
		ivas_dirac_config_bands_fx( band_grouping, hConfig->nbands, extract_l( Mpy_32_32_r( Fs, INV_CLDFB_BANDWIDTH_Q31 ) ), NULL, 0, 0, hFbMdft, 1 );
		}
		#else
		IF( EQ_32( ivas_format, SBA_FORMAT ) \|\| EQ_32( ivas_format, SBA_ISM_FORMAT ) )
		{
		// 100861_dirac_dec
		@@ -227,6 +238,7 @@ ivas_error ivas_dirac_config_fx(
		{
		ivas_dirac_config_bands_fx( band_grouping, hConfig->nbands, (Word16) ( Fs * INV_CLDFB_BANDWIDTH + 0.5f ), NULL, 0, 0, hFbMdft, 1 );
		}
		#endif

		return error;
		}

lib_com/options.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -111,7 +111,9 @@
		#define FIX_2049_DIFF_IN_DECORR_TAIL /* FhG: correct scale values in ivas_dirac_dec_binaural_process_output_fx() */
		#define FIX_2602_NONBE_SAT_IN_SWB_TBE_SCALE /* Dolby/FhG: fix for issue 2026: Saturation in SWB TBE re-scaling function preventing StereoDownmix complexity job to complete */
		#define FIX_1785_ASSERT_IN_IVAS_JBM_DEC_RENDER_FX /* Orange: 10ms Rendering: Assert in ivas_jbm_dec_render_fx() -> scale_sig32 */
		#define FIX_2021_BANDWIDTH_EXTENSION_PROBLEM /* FhG: increase cldfb buffer precision*/

		#define FIX_2085_FLOATING_POINT_LEFTOVERS /* FhG: convert floating-point leftovers in ivas_dirac_config_fx() */
		/* #################### Start BASOP porting switches ############################ */

		#define NONBE_1244_FIX_SWB_BWE_MEMORY /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */

lib_enc/ivas_core_enc_fx.c

+28 −0

Original line number	Diff line number	Diff line
		@@ -697,12 +697,40 @@ ivas_error ivas_core_enc_fx(
		{
		/* Common pre-processing for SWB(FB) TBE and SWB(FB) BWE */
		/* Scaling cldfb_state_fx */
		#ifdef FIX_2021_BANDWIDTH_EXTENSION_PROBLEM
		Word16 q_shift, scf_cldfb;
		scf_cldfb = L_norm_arr( st->cldfbSynTd->cldfb_state_fx, st->cldfbSynTd->p_filter_length );

		scale_sig32( st->cldfbSynTd->cldfb_state_fx, st->cldfbSynTd->p_filter_length, scf_cldfb );
		st->cldfbSynTd->Q_cldfb_state = add( st->cldfbSynTd->Q_cldfb_state, scf_cldfb );

		q_shift = sub( sub( q_re_im_buf[n], 1 ), st->cldfbSynTd->Q_cldfb_state ); // cldfb_state_fx will be used in cldfbSynthesis_ivas_fx and has to be aligned with (q_re_im_buf[n] - 1)
		IF( GT_32( q_shift, 0 ) )
		{
		FOR( int ts = 0; ts < CLDFB_NO_COL_MAX; i++ )
		{
		scale_sig32( realBuffer_fx[n][ts], CLDFB_NO_CHANNELS_MAX, negate( q_shift ) );
		scale_sig32( imagBuffer_fx[n][ts], CLDFB_NO_CHANNELS_MAX, negate( q_shift ) );
		}
		q_re_im_buf[n] = add( st->cldfbSynTd->Q_cldfb_state, 1 );
		}
		ELSE
		{
		scale_sig32( st->cldfbSynTd->cldfb_state_fx, st->cldfbSynTd->p_filter_length, q_shift ); // st->cldfbSynTd->Q_cldfb_state -> q_realImagBuffer
		st->cldfbSynTd->Q_cldfb_state = sub( q_re_im_buf[n], 1 );
		}
		#else
		scale_sig32( st->cldfbSynTd->cldfb_state_fx, st->cldfbSynTd->p_filter_length, sub( q_re_im_buf[n], st->cldfbSynTd->Q_cldfb_state ) ); // st->cldfbSynTd->Q_cldfb_state -> q_realImagBuffer
		#endif

		swb_pre_proc_ivas_fx( st, new_swb_speech_fx_16, new_swb_speech_fx, shb_speech_fx, &Q_shb_spch, realBuffer_fx[n], imagBuffer_fx[n], q_re_im_buf[n], hCPE );

		#ifdef FIX_2021_BANDWIDTH_EXTENSION_PROBLEM
		st->cldfbSynTd->Q_cldfb_state = sub( q_re_im_buf[n], 1 );
		#else
		/* Re-scaling cldfb_state_fx */
		scale_sig32( st->cldfbSynTd->cldfb_state_fx, st->cldfbSynTd->p_filter_length, negate( sub( q_re_im_buf[n], st->cldfbSynTd->Q_cldfb_state ) ) ); // q_realImagBuffer -> st->cldfbSynTd->Q_cldfb_state
		#endif
		}
		ELSE IF( GE_32( input_Fs, 32000 ) )
		{

lib_enc/swb_pre_proc_fx.c

+17 −1

Original line number	Diff line number	Diff line
		@@ -1104,6 +1104,10 @@ void swb_pre_proc_ivas_fx(
		IF( ( ( st->core == ACELP_CORE ) && NE_16( st->extl, SWB_BWE_HIGHRATE ) && NE_16( st->extl, FB_BWE_HIGHRATE ) ) \|\|
		( ( EQ_32( st->total_brate, ACELP_9k60 ) \|\| st->rf_mode ) && EQ_16( st->bwidth, SWB ) && ( st->element_mode == EVS_MONO ) ) )
		{
		#ifdef FIX_2021_BANDWIDTH_EXTENSION_PROBLEM
		Word64 CldfbHB64_fx = 0;
		move64();
		#endif
		Word32 CldfbHB_fx = 0; // fixed counterpart
		Word16 CldfbHB_fx_e = 0; // fixed counterpart
		#ifdef BASOP_NOGLOB_DECLARE_LOCAL
		@@ -1214,16 +1218,28 @@ void swb_pre_proc_ivas_fx(
		{
		FOR( ts = 0; ts < CLDFB_NO_COL_MAX; ts++ )
		{
		#ifdef FIX_2021_BANDWIDTH_EXTENSION_PROBLEM
		CldfbHB64_fx = W_mac_32_32( CldfbHB64_fx, realBufferFlipped[ts][nB], realBufferFlipped[ts][nB] );
		CldfbHB64_fx = W_mac_32_32( CldfbHB64_fx, imagBufferFlipped[ts][nB], imagBufferFlipped[ts][nB] );
		#else
		realQ_neg1 = extract_l( L_shr( realBufferFlipped[ts][nB], 16 ) );
		imagQ_neg1 = extract_l( L_shr( imagBufferFlipped[ts][nB], 16 ) ); /* Q(-1), headroom needed */

		CldfbHB_fx = L_mac0_o( CldfbHB_fx, realQ_neg1, realQ_neg1, &Overflow );
		CldfbHB_fx = L_mac0_o( CldfbHB_fx, imagQ_neg1, imagQ_neg1, &Overflow ); /* Q(-2) */
		#endif
		}
		}
		#ifdef FIX_2021_BANDWIDTH_EXTENSION_PROBLEM
		Word16 scf = W_norm( CldfbHB64_fx );
		CldfbHB64_fx = W_shl( CldfbHB64_fx, scf );
		CldfbHB_fx = W_extract_h( CldfbHB64_fx );
		CldfbHB_fx_e = sub( Q31, add( shl( q_reImBuffer, 1 ), sub( scf, Q31 ) ) );
		#else
		CldfbHB_fx_e = sub( Q31, shl( sub( q_reImBuffer, Q16 ), 1 ) );
		exp = norm_l( CldfbHB_fx );
		CldfbHB_fx = L_shl( CldfbHB_fx, exp ); /* CldfbHB_ener = CldfbHB_fl2^(exp) /
		#endif
		Cldfbtemp1 = Log2_norm_lc( CldfbHB_fx ); /* Log2_norm_lc(t) = 2^15(log2(t/2^30)) /
		Cldfbtemp1 = sub( shr( Cldfbtemp1, 6 ), shl( add( sub( Q31 - Q30, CldfbHB_fx_e ), exp ), 9 ) );
		CldfbHB_fx = L_mult( Cldfbtemp1, 9864 ); /* Q9 + Q15 + Q1 = Q25 */