Merge branch '1559_basop_PortFlpMR1441' into 'main-pc' (ca26c111) · Commits · SA4 / Audio / IVAS BASOP

lib_com/ivas_dirac_com_fx.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -179,9 +179,7 @@ ivas_error ivas_dirac_config_fx(
		test();
		IF( EQ_32( ivas_format, SBA_FORMAT ) \|\| EQ_32( ivas_format, SBA_ISM_FORMAT ) ) /* skip for MASA decoder */
		{
		IF( NE_32( ( error = ivas_dirac_sba_config_fx( hQMetaData, element_mode, ivas_total_brate, sba_order, sub( hConfig->nbands, spar_dirac_split_band ),
		ivas_format ) ),
		IVAS_ERR_OK ) )
		IF( NE_32( ( error = ivas_dirac_sba_config_fx( hQMetaData, element_mode, ivas_total_brate, sba_order, sub( hConfig->nbands, spar_dirac_split_band ), ivas_format ) ), IVAS_ERR_OK ) )
		{
		return error;
		}

lib_com/prot_fx.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -10910,12 +10910,6 @@ Word16 sum_s(
		const Word16 lvec /* i : length of input vector */
		);

		/! r: sum of all vector elements /
		Word32 sum_l(
		const Word32 vec, / i : input vector */
		const Word16 lvec /* i : length of input vector */
		);

		void set_c(
		Word8 y[], /* i/o: Vector to set */
		const Word8 a, /* i : Value to set the vector to */

lib_com/tools.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -85,7 +85,6 @@ Word16 norm_ul_float( UWord32 UL_var1 )
		/*---------------------------------------------------------------------
		* sum_s()
		* sum_l()
		* sum_f()
		*
		---------------------------------------------------------------------/

lib_dec/ivas_dirac_dec_fx.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -798,8 +798,10 @@ static ivas_error ivas_dirac_rend_config_fx(
		nchan_transport_tmp = nchan_transport;
		move16();
		}

		/* close and reopen the decorrelator */
		ivas_dirac_dec_decorr_close_fx( &hDirACRend->h_freq_domain_decorr_ap_params, &hDirACRend->h_freq_domain_decorr_ap_state );

		IF( NE_32( ( error = ivas_dirac_dec_decorr_open_fx( &( hDirACRend->h_freq_domain_decorr_ap_params ), &( hDirACRend->h_freq_domain_decorr_ap_state ), hSpatParamRendCom->num_freq_bands, hDirACRend->num_outputs_diff,
		hDirACRend->num_protos_diff, hDirACRend->synthesisConf, hDirACRend->frequency_axis_fx, nchan_transport_tmp, output_Fs ) ),
		IVAS_ERR_OK ) )
		@@ -1102,12 +1104,14 @@ ivas_error ivas_dirac_dec_config_fx(
		common_rend_config_flag = flag_config_inp;
		move32();
		}

		IF( NE_32( ( error = ivas_spat_hSpatParamRendCom_config_fx( &st_ivas->hSpatParamRendCom, common_rend_config_flag, dec_param_estim_new,
		st_ivas->ivas_format, st_ivas->mc_mode, output_Fs, hodirac_flag, 0 ) ),
		IVAS_ERR_OK ) )
		{
		return error;
		}

		IF( need_dirac_rend )
		{
		IF( st_ivas->hDirACRend == NULL )
		@@ -1167,13 +1171,15 @@ ivas_error ivas_dirac_dec_config_fx(
		{
		st_ivas->hDiracDecBin[pos_idx]->useTdDecorr = st_ivas->hDiracDecBin[0]->useTdDecorr;
		}
		IF( !st_ivas->hDiracDecBin[0]->useTdDecorr )

		IF( !st_ivas->hDiracDecBin[0]->useTdDecorr )
		{
		IF( st_ivas->hDiracDecBin[0]->h_freq_domain_decorr_ap_params == NULL )
		{
		Word16 frequency_axis_fx[CLDFB_NO_CHANNELS_MAX];

		ivas_dirac_dec_get_frequency_axis_fx( frequency_axis_fx, st_ivas->hDecoderConfig->output_Fs, st_ivas->hSpatParamRendCom->num_freq_bands );

		IF( NE_32( ( error = ivas_dirac_dec_decorr_open_fx( &( st_ivas->hDiracDecBin[0]->h_freq_domain_decorr_ap_params ), &( st_ivas->hDiracDecBin[0]->h_freq_domain_decorr_ap_state ), st_ivas->hSpatParamRendCom->num_freq_bands, BINAURAL_CHANNELS, BINAURAL_CHANNELS,
		DIRAC_SYNTHESIS_PSD_LS, frequency_axis_fx, BINAURAL_CHANNELS, st_ivas->hDecoderConfig->output_Fs ) ),
		IVAS_ERR_OK ) )
		@@ -1182,6 +1188,7 @@ ivas_error ivas_dirac_dec_config_fx(
		}
		}
		}

		FOR( pos_idx = 0; pos_idx < num_poses; pos_idx++ )
		{
		st_ivas->hDiracDecBin[pos_idx]->reqularizationFactor_fx = configure_reqularization_factor_fx( st_ivas->ivas_format, st_ivas->hDecoderConfig->ivas_total_brate );

lib_dec/ivas_ism_dec_fx.c

+5 −11

Original line number	Diff line number	Diff line
		@@ -454,20 +454,16 @@ ivas_error ivas_ism_dec_config_fx(
		IF( st_ivas->ini_active_frame != 0 )
		{
		/* ISM bit-rate switching */
		{
		test();
		IF( ( NE_16( st_ivas->ism_mode, last_ism_mode ) ) \|\| ( NE_32( st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->hDecoderConfig->last_ivas_total_brate ) ) )
		{
		IF( NE_16( ( error = ivas_ism_bitrate_switching_dec_fx( st_ivas, nchan_transport_old, last_ism_mode, nSamplesRendered,
		data ) ),
		IVAS_ERR_OK ) )
		IF( NE_16( ( error = ivas_ism_bitrate_switching_dec_fx( st_ivas, nchan_transport_old, last_ism_mode, nSamplesRendered, data ) ), IVAS_ERR_OK ) )
		{
		return error;
		}
		}
		}
		}
		}
		ELSE IF( !st_ivas->bfi && EQ_32( ivas_total_brate, IVAS_SID_5k2 ) )
		{
		st_ivas->nchan_transport = st_ivas->nchan_ism;
		@@ -486,9 +482,7 @@ ivas_error ivas_ism_dec_config_fx(
		/* ISM mode switching */
		IF( NE_32( st_ivas->ism_mode, last_ism_mode ) )
		{
		IF( NE_16( ( error = ivas_ism_bitrate_switching_dec_fx( st_ivas, nchan_transport_old, last_ism_mode, nSamplesRendered,
		data ) ),
		IVAS_ERR_OK ) )
		IF( NE_16( ( error = ivas_ism_bitrate_switching_dec_fx( st_ivas, nchan_transport_old, last_ism_mode, nSamplesRendered, data ) ), IVAS_ERR_OK ) )
		{
		return error;
		}