[cleanup] accept FIX_390_EXT_REND_MASA_META_COPY (8e3fc6f5) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -144,7 +144,6 @@



		#define FIX_390_EXT_REND_MASA_META_COPY /* Nokia: Issue 390: Fixes MASA metadata copying to renderer. */
		#define FIX_392_LATE_REVERB /* DLB : Issue 392: keep late reverb by default off when output config is not BINAURAL_ROOM*/

		#define FIX_ISM_DTX_CLICKS /* FhG: fix for clicks in ISM DTX for inactive to active TCX transitions */

lib_rend/lib_rend.c

+0 −29

Original line number	Diff line number	Diff line
		@@ -2222,9 +2222,7 @@ static ivas_error initMasaDummyDecForMcOut(
		{
		return error;
		}
		#ifdef FIX_390_EXT_REND_MASA_META_COPY
		decDummy->hDirAC->dirac_bs_md_write_idx = 0;
		#endif

		if ( decDummy->renderer_type == RENDERER_STEREO_PARAMETRIC )
		{
		@@ -2301,9 +2299,7 @@ static ivas_error initMasaDummyDecForSbaOut(
		{
		return error;
		}
		#ifdef FIX_390_EXT_REND_MASA_META_COPY
		decDummy->hDirAC->dirac_bs_md_write_idx = 0;
		#endif

		numCldfbAnalyses = decDummy->nchan_transport;
		numCldfbSyntheses = decDummy->hDecoderConfig->nchan_out;
		@@ -2372,9 +2368,7 @@ static ivas_error initMasaDummyDecForBinauralOut(
		{
		return error;
		}
		#ifdef FIX_390_EXT_REND_MASA_META_COPY
		decDummy->hDirAC->dirac_bs_md_write_idx = 0;
		#endif

		if ( ( error = ivas_dirac_dec_binaural_copy_hrtfs( &decDummy->hHrtfParambin ) ) != IVAS_ERR_OK )
		{
		@@ -5312,61 +5306,38 @@ static void copyMasaMetadataToDiracRenderer(
		DIRAC_DEC_HANDLE hDirAC )
		{
		int16_t band, sf, bin;
		#ifdef FIX_390_EXT_REND_MASA_META_COPY
		int16_t meta_write_index;
		#endif

		hDirAC->numSimultaneousDirections = meta->descriptive_meta.numberOfDirections + 1;

		for ( sf = 0; sf < MAX_PARAM_SPATIAL_SUBFRAMES; sf++ )
		{
		#ifdef FIX_390_EXT_REND_MASA_META_COPY
		meta_write_index = ( hDirAC->dirac_bs_md_write_idx + sf ) % hDirAC->dirac_md_buffer_length;
		#endif

		for ( band = 0; band < MASA_MAXIMUM_CODING_SUBBANDS; band++ )
		{
		for ( bin = MASA_band_grouping_24[band]; bin < MASA_band_grouping_24[band + 1]; bin++ )
		{
		#ifdef FIX_390_EXT_REND_MASA_META_COPY
		hDirAC->azimuth[meta_write_index][bin] = (int16_t) meta->directional_meta[0].azimuth[sf][band];
		hDirAC->elevation[meta_write_index][bin] = (int16_t) meta->directional_meta[0].elevation[sf][band];
		hDirAC->energy_ratio1[meta_write_index][bin] = meta->directional_meta[0].energy_ratio[sf][band];
		hDirAC->diffuseness_vector[meta_write_index][bin] = 1.0f - meta->directional_meta[0].energy_ratio[sf][band];
		hDirAC->spreadCoherence[meta_write_index][bin] = meta->directional_meta[0].spread_coherence[sf][band];
		hDirAC->surroundingCoherence[meta_write_index][bin] = meta->common_meta.surround_coherence[sf][band];
		#else
		hDirAC->azimuth[sf][bin] = (int16_t) meta->directional_meta[0].azimuth[sf][band];
		hDirAC->elevation[sf][bin] = (int16_t) meta->directional_meta[0].elevation[sf][band];
		hDirAC->energy_ratio1[sf][bin] = meta->directional_meta[0].energy_ratio[sf][band];
		hDirAC->diffuseness_vector[sf][bin] = 1.0f - meta->directional_meta[0].energy_ratio[sf][band];
		hDirAC->spreadCoherence[sf][bin] = meta->directional_meta[0].spread_coherence[sf][band];
		hDirAC->surroundingCoherence[sf][bin] = meta->common_meta.surround_coherence[sf][band];
		#endif

		if ( hDirAC->numSimultaneousDirections == 2 )
		{
		#ifdef FIX_390_EXT_REND_MASA_META_COPY
		hDirAC->azimuth2[meta_write_index][bin] = (int16_t) meta->directional_meta[1].azimuth[sf][band];
		hDirAC->elevation2[meta_write_index][bin] = (int16_t) meta->directional_meta[1].elevation[sf][band];
		hDirAC->energy_ratio2[meta_write_index][bin] = meta->directional_meta[1].energy_ratio[sf][band];
		hDirAC->diffuseness_vector[meta_write_index][bin] -= meta->directional_meta[1].energy_ratio[sf][band];
		hDirAC->spreadCoherence2[meta_write_index][bin] = meta->directional_meta[1].spread_coherence[sf][band];
		#else
		hDirAC->azimuth2[sf][bin] = (int16_t) meta->directional_meta[1].azimuth[sf][band];
		hDirAC->elevation2[sf][bin] = (int16_t) meta->directional_meta[1].elevation[sf][band];
		hDirAC->energy_ratio2[sf][bin] = meta->directional_meta[1].energy_ratio[sf][band];
		hDirAC->diffuseness_vector[sf][bin] -= meta->directional_meta[1].energy_ratio[sf][band];
		hDirAC->spreadCoherence2[sf][bin] = meta->directional_meta[1].spread_coherence[sf][band];
		#endif
		}
		}
		}
		}
		#ifdef FIX_390_EXT_REND_MASA_META_COPY

		hDirAC->dirac_bs_md_write_idx = ( hDirAC->dirac_bs_md_write_idx + MAX_PARAM_SPATIAL_SUBFRAMES ) % hDirAC->dirac_md_buffer_length;
		#endif

		return;
		}