accept NONBE_FIX_907_VLBR_DIRAC_BAND_MAPPING (d1cf9274) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_dirac_com.c

+1 −21

Original line number	Diff line number	Diff line
		@@ -194,19 +194,11 @@ ivas_error ivas_dirac_config(

		if ( ivas_format == SBA_FORMAT \|\| ivas_format == SBA_ISM_FORMAT )
		{
		#ifdef NONBE_FIX_907_VLBR_DIRAC_BAND_MAPPING
		ivas_dirac_config_bands( band_grouping, IVAS_MAX_NUM_BANDS, (int16_t) ( 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( band_grouping, IVAS_MAX_NUM_BANDS, (int16_t) ( 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( band_grouping, hConfig->nbands, (int16_t) ( Fs * INV_CLDFB_BANDWIDTH + 0.5f ), NULL, 0, 0, hFbMdft, 1 );
		#else
		ivas_dirac_config_bands( band_grouping, hConfig->nbands, (int16_t) ( Fs * INV_CLDFB_BANDWIDTH + 0.5f ), NULL, 0, 0, hFbMdft );
		#endif
		}

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

		#ifdef NONBE_FIX_907_VLBR_DIRAC_BAND_MAPPING
		void ivas_dirac_config_bands(
		int16_t band_grouping, / o : band grouping */
		const int16_t nbands, /* i : number of bands */
		@@ -229,16 +220,6 @@ void ivas_dirac_config_bands(
		const int16_t enc_param_start_band,
		IVAS_FB_MIXER_HANDLE hFbMdft,
		const int8_t BandGroupLowRes )
		#else
		void ivas_dirac_config_bands(
		int16_t band_grouping, / o : band grouping */
		const int16_t nbands, /* i : number of bands */
		const int16_t max_band, /* i : maximal band index +1 */
		int16_t *dirac_to_spar_md_bands,
		const int8_t useLowerBandRes,
		const int16_t enc_param_start_band,
		IVAS_FB_MIXER_HANDLE hFbMdft )
		#endif
		{
		int16_t i;
		{
		@@ -289,9 +270,8 @@ void ivas_dirac_config_bands(
		{
		int16_t step = DIRAC_LOW_BANDRES_STEP;
		int16_t 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++ )
		{

lib_com/ivas_prot.h

+0 −14

Original line number	Diff line number	Diff line
		@@ -3629,7 +3629,6 @@ ivas_error ivas_dirac_config(
		const int16_t enc_dec /* i : encoder or decoder flag */
		);

		#ifdef NONBE_FIX_907_VLBR_DIRAC_BAND_MAPPING
		void ivas_dirac_config_bands(
		int16_t band_grouping, / o : band grouping */
		const int16_t nbands, /* i : number of bands */
		@@ -3640,19 +3639,6 @@ void ivas_dirac_config_bands(
		IVAS_FB_MIXER_HANDLE hFbMdft, /* i : MDFT filterbank handle */
		const int8_t BandGroupLowRes /* i : flag indicating lower band grouping resolution for DirAC */
		);
		#else
		void ivas_dirac_config_bands(
		int16_t band_grouping, / o : band grouping */
		const int16_t nbands, /* i : number of bands */
		const int16_t max_band, /* i : maximal band index +1 */
		int16_t dirac_to_spar_md_bands, / o : mapping of DirAC parameter band index to SPAR FB band index */
		const int8_t useLowerBandRes, /* i : flag indicating lower band resolution for DirAC */
		const int16_t enc_param_start_band, /* i : band index of first DirAC parameter band */
		IVAS_FB_MIXER_HANDLE hFbMdft
		);
		#endif



		void ivas_get_dirac_sba_max_md_bits(
		const int32_t sba_total_brate,

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -161,7 +161,6 @@
		/* all switches in this category should start with "NONBE_" */

		#define NONBE_FIX_856_TCX_LTP_SYNTH_FILTER /* FhG: issue 856: correct filtering length for tcx-ltp synth filtering*/
		#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 NONBE_FIX_931_IGF_STEREO_DEC_NOISE /* FhG: issue #931: fix noise substitution in the stereo IGF decoder */
		#define NONBE_FIX_943_RECONFIG_IGF_AFTER_SETTING_BW /* FhG: issue 943: fix crash in BW switchin from WB in MDCT-Stereo core encoder */

lib_dec/ivas_dirac_dec.c

+3 −8

Original line number	Diff line number	Diff line
		@@ -1275,11 +1275,9 @@ void ivas_qmetadata_to_dirac(
		/* SID/zero-frame: 1 direction, 5 bands, nblocks re-generated out of SID decoder*/
		start_band = 0;
		hDirAC->hConfig->nbands = 5;
		#ifdef NONBE_FIX_907_VLBR_DIRAC_BAND_MAPPING

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

		nbands = 5;
		}
		else
		@@ -1294,11 +1292,8 @@ void ivas_qmetadata_to_dirac(
		hDirAC->hConfig->nbands = q_direction->cfg.nbands;
		}

		#ifdef NONBE_FIX_907_VLBR_DIRAC_BAND_MAPPING
		ivas_dirac_config_bands( 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( 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;
		if ( hQMetaData->q_direction[0].cfg.nblocks == 0 )
		{

lib_dec/ivas_init_dec.c

+0 −10

Original line number	Diff line number	Diff line
		@@ -1385,13 +1385,8 @@ ivas_error ivas_init_decoder(
		st_ivas->hQMetaData->numTwoDirBands = (uint8_t) st_ivas->hQMetaData->q_direction[0].cfg.nbands;
		}

		#ifdef NONBE_FIX_907_VLBR_DIRAC_BAND_MAPPING
		ivas_dirac_config_bands( band_grouping, IVAS_MAX_NUM_BANDS, (int16_t) ( st_ivas->hDecoderConfig->output_Fs * INV_CLDFB_BANDWIDTH + 0.5f ),
		st_ivas->hSpar->dirac_to_spar_md_bands, st_ivas->hQMetaData->useLowerBandRes, st_ivas->hSpar->enc_param_start_band, 0, 1 );
		#else
		ivas_dirac_config_bands( band_grouping, IVAS_MAX_NUM_BANDS, (int16_t) ( st_ivas->hDecoderConfig->output_Fs * INV_CLDFB_BANDWIDTH + 0.5f ),
		st_ivas->hSpar->dirac_to_spar_md_bands, st_ivas->hQMetaData->useLowerBandRes, st_ivas->hSpar->enc_param_start_band, 0 );
		#endif
		}
		st_ivas->sba_dirac_stereo_flag = ivas_get_sba_dirac_stereo_flag( st_ivas );

		@@ -1545,13 +1540,8 @@ ivas_error ivas_init_decoder(
		st_ivas->hQMetaData->numTwoDirBands = (uint8_t) st_ivas->hQMetaData->q_direction[0].cfg.nbands;
		}

		#ifdef NONBE_FIX_907_VLBR_DIRAC_BAND_MAPPING
		ivas_dirac_config_bands( band_grouping, IVAS_MAX_NUM_BANDS, (int16_t) ( st_ivas->hDecoderConfig->output_Fs * INV_CLDFB_BANDWIDTH + 0.5f ),
		st_ivas->hSpar->dirac_to_spar_md_bands, st_ivas->hQMetaData->useLowerBandRes, st_ivas->hSpar->enc_param_start_band, 0, 1 );
		#else
		ivas_dirac_config_bands( band_grouping, IVAS_MAX_NUM_BANDS, (int16_t) ( st_ivas->hDecoderConfig->output_Fs * INV_CLDFB_BANDWIDTH + 0.5f ),
		st_ivas->hSpar->dirac_to_spar_md_bands, st_ivas->hQMetaData->useLowerBandRes, st_ivas->hSpar->enc_param_start_band, 0 );
		#endif
		}

		for ( sce_id = 0; sce_id < st_ivas->nSCE; sce_id++ )