Merge branch '20231219_basop_cleanup' into 'main-pc' (be48908c) · Commits · SA4 / Audio / IVAS BASOP

lib_com/ivas_dirac_com_fx.c

+9 −27

Original line number	Diff line number	Diff line
		@@ -223,19 +223,11 @@ ivas_error ivas_dirac_config_fx(
		IF( EQ_32( ivas_format, SBA_FORMAT ) \|\| EQ_32( ivas_format, SBA_ISM_FORMAT ) )
		{
		// 100861_dirac_dec
		#ifdef NONBE_FIX_907_VLBR_DIRAC_BAND_MAPPING
		ivas_dirac_config_bands_fx( band_grouping, IVAS_MAX_NUM_BANDS, (Word16) ( Fs * INV_CLDFB_BANDWIDTH + 0.5f ), dirac_to_spar_md_bands, hQMetaData->useLowerBandRes, hConfig->enc_param_start_band, hFbMdft, 1 );
		#else
		ivas_dirac_config_bands_fx( band_grouping, IVAS_MAX_NUM_BANDS, (Word16) ( Fs * INV_CLDFB_BANDWIDTH + 0.5f ), dirac_to_spar_md_bands, hQMetaData->useLowerBandRes, hConfig->enc_param_start_band, hFbMdft );
		#endif
		}
		ELSE
		{
		#ifdef NONBE_FIX_907_VLBR_DIRAC_BAND_MAPPING
		ivas_dirac_config_bands_fx( band_grouping, hConfig->nbands, (Word16) ( Fs * INV_CLDFB_BANDWIDTH + 0.5f ), NULL, 0, 0, hFbMdft, 1 );
		#else
		ivas_dirac_config_bands_fx( band_grouping, hConfig->nbands, (Word16) ( Fs * INV_CLDFB_BANDWIDTH + 0.5f ), NULL, 0, 0, hFbMdft );
		#endif
		}

		return error;
		@@ -248,7 +240,6 @@ ivas_error ivas_dirac_config_fx(
		* DirAC Configuration freq. band function; used also in MASA decoder
		------------------------------------------------------------------------/

		#ifdef NONBE_FIX_907_VLBR_DIRAC_BAND_MAPPING
		void ivas_dirac_config_bands_fx(
		Word16 band_grouping, / o : band grouping */
		const Word16 nbands, /* i : number of bands */
		@@ -258,16 +249,6 @@ void ivas_dirac_config_bands_fx(
		const Word16 enc_param_start_band, /* i : band index of first DirAC parameter band */
		IVAS_FB_MIXER_HANDLE hFbMdft,
		const Word8 BandGroupLowRes )
		#else
		void ivas_dirac_config_bands_fx(
		Word16 band_grouping, / o : band grouping */
		const Word16 nbands, /* i : number of bands */
		const Word16 max_band, /* i : maximal band index +1 */
		Word16 *dirac_to_spar_md_bands,
		const Word8 useLowerBandRes,
		const Word16 enc_param_start_band,
		IVAS_FB_MIXER_HANDLE hFbMdft )
		#endif
		{
		Word16 i;
		{
		@@ -327,9 +308,8 @@ void ivas_dirac_config_bands_fx(
		Word16 step = DIRAC_LOW_BANDRES_STEP;
		move16();
		Word16 reduced_band;
		#ifdef NONBE_FIX_907_VLBR_DIRAC_BAND_MAPPING

		IF( BandGroupLowRes )
		#endif
		{
		FOR( ( band = enc_param_start_band + 2, reduced_band = enc_param_start_band + 1 ); band <= DIRAC_MAX_NBANDS; ( band += step, reduced_band++ ) )
		{
		@@ -377,6 +357,8 @@ void ivas_dirac_config_bands_fx(

		return;
		}


		/-------------------------------------------------------------------
		* ivas_get_dirac_sba_max_md_bits()
		*

lib_com/ivas_prot_fx.h

+0 −18

Original line number	Diff line number	Diff line
		@@ -3903,13 +3903,6 @@ ivas_error ivas_td_binaural_open_fx(
		Word16 SrcInd, /Temporarily used to store the updated value of SrcInd*/
		Word16 *num_src
		);
		#ifndef FIX_910_REMOVE_DUPLICATION_TD_REND
		ivas_error ivas_td_binaural_renderer_fx(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		Word32 output[], / i/o: SCE channels / Binaural synthesis */
		const Word16 output_frame /* i : output frame length */
		);
		#endif

		ivas_error ivas_td_binaural_renderer_sf_fx(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		@@ -5003,7 +4996,6 @@ void ivas_sba2mc_cldfb_fixed(
		const Word32 hoa_dec_mtx / i : HOA decoding mtx */
		);

		#ifdef NONBE_FIX_907_VLBR_DIRAC_BAND_MAPPING
		void ivas_dirac_config_bands_fx(
		Word16 band_grouping, / o : band grouping */
		const Word16 nbands, /* i : number of bands */
		@@ -5013,16 +5005,6 @@ void ivas_dirac_config_bands_fx(
		const Word16 enc_param_start_band, /* i : band index of first DirAC parameter band */
		IVAS_FB_MIXER_HANDLE hFbMdft,
		const Word8 BandGroupLowRes );
		#else
		void ivas_dirac_config_bands_fx(
		Word16 band_grouping, / o : band grouping */
		const Word16 nbands, /* i : number of bands */
		const Word16 max_band, /* i : maximal band index +1 */
		Word16 dirac_to_spar_md_bands, / o : mapping of DirAC parameter band index to SPAR FB band index */
		const Word8 useLowerBandRes, /* i : flag indicating lower band resolution for DirAC */
		const Word16 enc_param_start_band, /* i : band index of first DirAC parameter band */
		IVAS_FB_MIXER_HANDLE hFbMdft );
		#endif

		void ivas_dirac_dec_close_fx(
		DIRAC_DEC_HANDLE *hDirAC_out );

lib_com/options.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -183,12 +183,6 @@
		#define FIX_1372_ISAR_POST_REND
		#endif
		#define NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM /* FhG: issue 1058: do not initialize EFAP when IntSetup is HOA3 */
		#define NONBE_FIX_907_VLBR_DIRAC_BAND_MAPPING /* Dlb: issue 907: fix for band mapping at VLBR */
		#define NONBE_FIX_869_MASA_PREREND_MERGE /* Nokia: issue: #869: MASA pre-rend not updating energy */
		#define FIX_910_REMOVE_DUPLICATION_TD_REND /* VA: issue 910: remove duplication of function ivas_td_binaural_renderer() */
		#define FIX_940_DEBUGGING_VARIABLE /* Nokia: issue #940: remove debugging variable */
		#define NONBE_FIX_931_IGF_STEREO_DEC_NOISE /* FhG: issue #931: fix noise substitution in the stereo IGF decoder */
		#define FIX_CRASH_LONG_BRIR /* Orange : port 1202 Fix crash when long BRIR is set */
		#define NONBE_FIX_943_RECONFIG_IGF_AFTER_SETTING_BW /* FhG: issue 943: fix crash in BW switchin from WB in MDCT-Stereo core encoder */
		#define FIX_911_REMOVE_CREND_DUPLICATION /* VA: issue 911: resolve duplication of CRend binaural external renderer function */
		#define FIX_938_GCC_12_WARNINGS /* VA: issue #938: remove set_f(.,.,0) call in which length is always 0 to remove GCC 12.0 warning */

lib_dec/igf_dec_fx.c

+0 −48

Original line number	Diff line number	Diff line
		@@ -964,7 +964,6 @@ static void IGF_prepStereo(
		{
		IF( hPrivateDataL->n_noise_bands_off )
		{
		#ifdef NONBE_FIX_931_IGF_STEREO_DEC_NOISE
		IGF_replaceTCXNoise_2_new_ivas( src_specL_fx,
		src_specL_e,
		TCXNoiseL,
		@@ -974,17 +973,6 @@ static void IGF_prepStereo(
		hPrivateDataL->totalNoiseNrg_off_exp,
		hPrivateDataL->n_noise_bands_off,
		hInfoL->nfSeed );
		#else
		IGF_replaceTCXNoise_2_new_ivas_with_var_shift( igf_specL_fx,
		igf_specL_e_arr,
		TCXNoiseL,
		strt_cpy,
		stop,
		hPrivateDataL->totalNoiseNrg_off,
		hPrivateDataL->totalNoiseNrg_off_exp,
		hPrivateDataL->n_noise_bands_off,
		hInfoL->nfSeed );
		#endif
		}
		selectionL = 1;
		move16();
		@@ -1011,7 +999,6 @@ static void IGF_prepStereo(
		{
		IF( hPrivateDataR->n_noise_bands_off )
		{
		#ifdef NONBE_FIX_931_IGF_STEREO_DEC_NOISE
		IGF_replaceTCXNoise_2_new_ivas( src_specR_fx,
		src_specR_e,
		TCXNoiseR,
		@@ -1021,17 +1008,6 @@ static void IGF_prepStereo(
		hPrivateDataR->totalNoiseNrg_off_exp,
		hPrivateDataR->n_noise_bands_off,
		hInfoR->nfSeed );
		#else
		IGF_replaceTCXNoise_2_new_ivas_with_var_shift( igf_specR_fx,
		igf_specR_e_arr,
		TCXNoiseR,
		strt_cpy,
		stop,
		hPrivateDataR->totalNoiseNrg_off,
		hPrivateDataR->totalNoiseNrg_off_exp,
		hPrivateDataR->n_noise_bands_off,
		hInfoR->nfSeed );
		#endif
		}
		selectionR = 1;
		move16();
		@@ -1153,7 +1129,6 @@ static void IGF_prepStereo(
		{
		IF( hPrivateDataL->n_noise_bands_off )
		{
		#ifdef NONBE_FIX_931_IGF_STEREO_DEC_NOISE
		IGF_replaceTCXNoise_2_new_ivas( src_specL_fx,
		src_specL_e,
		TCXNoiseL,
		@@ -1163,17 +1138,6 @@ static void IGF_prepStereo(
		hPrivateDataL->totalNoiseNrg_off_exp,
		hPrivateDataL->n_noise_bands_off,
		hInfoL->nfSeed );
		#else
		IGF_replaceTCXNoise_2_new_ivas_with_var_shift( igf_specL_fx,
		igf_specL_e_arr,
		TCXNoiseL,
		strt_cpy,
		stop,
		hPrivateDataL->totalNoiseNrg_off,
		hPrivateDataL->totalNoiseNrg_off_exp,
		hPrivateDataL->n_noise_bands_off,
		hInfoL->nfSeed );
		#endif
		}
		selectionL = 1;
		move16();
		@@ -1200,7 +1164,6 @@ static void IGF_prepStereo(
		{
		IF( hPrivateDataR->n_noise_bands_off )
		{
		#ifdef NONBE_FIX_931_IGF_STEREO_DEC_NOISE
		IGF_replaceTCXNoise_2_new_ivas( src_specR_fx,
		src_specR_e,
		TCXNoiseR,
		@@ -1210,17 +1173,6 @@ static void IGF_prepStereo(
		hPrivateDataR->totalNoiseNrg_off_exp,
		hPrivateDataR->n_noise_bands_off,
		hInfoR->nfSeed );
		#else
		IGF_replaceTCXNoise_2_new_ivas_with_var_shift( igf_specR_fx,
		igf_specR_e_arr,
		TCXNoiseR,
		strt_cpy,
		stop,
		hPrivateDataR->totalNoiseNrg_off,
		hPrivateDataR->totalNoiseNrg_off_exp,
		hPrivateDataR->n_noise_bands_off,
		hInfoR->nfSeed );
		#endif
		}
		selectionR = 1;
		move16();

lib_dec/ivas_dirac_dec_fx.c

+3 −8

Original line number	Diff line number	Diff line
		@@ -1624,11 +1624,9 @@ void ivas_qmetadata_to_dirac_fx(
		move16();
		hDirAC->hConfig->nbands = 5;
		move16();
		#ifdef NONBE_FIX_907_VLBR_DIRAC_BAND_MAPPING

		ivas_dirac_config_bands_fx( hDirAC->band_grouping, hDirAC->hConfig->nbands, nbands, NULL, 0, 0, NULL, 1 );
		#else
		ivas_dirac_config_bands_fx( hDirAC->band_grouping, hDirAC->hConfig->nbands, nbands, NULL, 0, 0, NULL );
		#endif

		nbands = 5;
		move16();
		}
		@@ -1647,11 +1645,8 @@ void ivas_qmetadata_to_dirac_fx(
		move16();
		}

		#ifdef NONBE_FIX_907_VLBR_DIRAC_BAND_MAPPING
		ivas_dirac_config_bands_fx( hDirAC->band_grouping, hDirAC->hConfig->nbands, nbands, dirac_to_spar_md_bands, hQMetaData->useLowerBandRes, hDirAC->hConfig->enc_param_start_band, hDirAC->hFbMdft, 0 );
		#else
		ivas_dirac_config_bands_fx( hDirAC->band_grouping, hDirAC->hConfig->nbands, nbands, dirac_to_spar_md_bands, hQMetaData->useLowerBandRes, hDirAC->hConfig->enc_param_start_band, hDirAC->hFbMdft );
		#endif

		nbands = hDirAC->hConfig->nbands;
		move16();
		if ( hQMetaData->q_direction[0].cfg.nblocks == 0 )