BAOSP porting: fix for issue 1438 (92caa629) · Commits · SA4 / Audio / IVAS BASOP

lib_com/ivas_dirac_com.c

+33 −7

Original line number	Diff line number	Diff line
		@@ -195,11 +195,19 @@ 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;
		@@ -207,11 +215,22 @@ ivas_error ivas_dirac_config(


		/*-------------------------------------------------------------------------
		* ivas_dirac_sba_config_bands()
		* ivas_dirac_config_bands()
		*
		* 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 */
		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,
		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 */
		@@ -220,6 +239,7 @@ void ivas_dirac_config_bands(
		const int8_t useLowerBandRes,
		const int16_t enc_param_start_band,
		IVAS_FB_MIXER_HANDLE hFbMdft )
		#endif
		{
		int16_t i;
		{
		@@ -270,6 +290,10 @@ 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++ )
		{
		band_grouping[reduced_band] = band_grouping[band];
		@@ -278,6 +302,8 @@ void ivas_dirac_config_bands(
		{
		band_grouping[reduced_band] = max_band;
		}
		}

		for ( band = enc_param_start_band + ( DIRAC_MAX_NBANDS - enc_param_start_band ) / 2 - 1, reduced_band = DIRAC_MAX_NBANDS - 1; band >= enc_param_start_band; band--, reduced_band -= step )
		{
		dirac_to_spar_md_bands[reduced_band] = dirac_to_spar_md_bands[band];

lib_com/ivas_prot.h

+13 −0

Original line number	Diff line number	Diff line
		@@ -3662,6 +3662,18 @@ 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 */
		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, /* 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 */
		@@ -3671,6 +3683,7 @@ void ivas_dirac_config_bands(
		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

+1 −0

Original line number	Diff line number	Diff line
		@@ -204,6 +204,7 @@
		#define FIX_929_RENDERER_CMDL /* Nokia: issue #929: renderer command line option */
		#define NONBE_FIX_BINAURAL_ROOM_IR_REVERBERATOR /* FhG: re-enable acidentially disabled reverberator for BINAURAL_ROOM_IR */
		#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 */

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

lib_dec/ivas_dirac_dec.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -1287,7 +1287,11 @@ 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
		@@ -1302,7 +1306,11 @@ 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

+11 −0

Original line number	Diff line number	Diff line
		@@ -1356,8 +1356,14 @@ 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 );

		@@ -1510,8 +1516,13 @@ 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++ )