fix OSBA JBM split rendering (4384cafb) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_dec/ivas_jbm_dec.c

+15 −5

Original line number	Diff line number	Diff line
		@@ -883,11 +883,20 @@ ivas_error ivas_jbm_dec_feed_tc_to_renderer(
		ivas_ism_dec_digest_tc( st_ivas );

		/* delay the objects here for all renderers where it is needed */
		if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV \|\|
		if (
		#ifdef OSBA_SPLIT_RENDERING
		(
		#endif
		st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV \|\|
		st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM \|\|
		st_ivas->renderer_type == RENDERER_OSBA_AMBI \|\|
		st_ivas->renderer_type == RENDERER_OSBA_LS \|\|
		st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL )
		st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL
		#ifdef OSBA_SPLIT_RENDERING
		) &&
		( st_ivas->hDecoderConfig->output_config != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED && st_ivas->hDecoderConfig->output_config != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
		#endif
		)
		{
		for ( n = 0; n < st_ivas->nchan_ism; n++ )
		{
		@@ -1449,6 +1458,7 @@ ivas_error ivas_jbm_dec_render(
		}
		}
		#endif

		if ( st_ivas->transport_config != st_ivas->intern_config && ( st_ivas->intern_config == IVAS_AUDIO_CONFIG_FOA \|\| st_ivas->intern_config == IVAS_AUDIO_CONFIG_HOA2 \|\| st_ivas->intern_config == IVAS_AUDIO_CONFIG_HOA3 ) )
		{
		ivas_mc2sba( st_ivas->hTransSetup, p_output, p_output, *nSamplesRendered, st_ivas->hIntSetup.ambisonics_order, GAIN_LFE );

lib_dec/ivas_osba_dec.c

+52 −7

Original line number	Diff line number	Diff line
		@@ -138,6 +138,48 @@ ivas_error ivas_osba_dirac_td_binaural_jbm(

		ivas_sba_dec_render( st_ivas, nSamplesAsked, nSamplesRendered, nSamplesAvailable, &output_f[2] );

		#ifdef OSBA_SPLIT_RENDERING
		if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
		{
		int16_t slot_idx, num_cldfb_bands, b, nchan_transport_orig;
		int16_t cldfb_slots, slot_idx_start;
		float Cldfb_RealBuffer[CLDFB_NO_CHANNELS_MAX];
		float Cldfb_ImagBuffer[CLDFB_NO_CHANNELS_MAX];

		num_cldfb_bands = st_ivas->hSplitBinRend.splitrend.hCldfbHandles->cldfbAna[0]->no_channels;
		nchan_transport_orig = st_ivas->nchan_transport;
		st_ivas->nchan_transport = st_ivas->nchan_ism;
		slot_idx_start = st_ivas->hTcBuffer->n_samples_rendered / num_cldfb_bands;
		if ( ( error = ivas_td_binaural_renderer_sf_splitBinaural( st_ivas, output_f, *nSamplesRendered ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		st_ivas->nchan_transport = nchan_transport_orig;
		cldfb_slots = *nSamplesRendered / num_cldfb_bands;

		for ( n = 0; n < st_ivas->hSplitBinRend.splitrend.multiBinPoseData.num_poses * BINAURAL_CHANNELS; ++n )
		{
		for ( slot_idx = 0; slot_idx < cldfb_slots; slot_idx++ )
		{
		cldfbAnalysis_ts( &( output_f[n][num_cldfb_bands * slot_idx] ), Cldfb_RealBuffer, Cldfb_ImagBuffer, num_cldfb_bands, st_ivas->hSplitBinRend.splitrend.hCldfbHandles->cldfbAna[n] );

		for ( b = 0; b < num_cldfb_bands; b++ )
		{
		st_ivas->hSplitBinRend.hMultiBinCldfbData->Cldfb_RealBuffer_Binaural[n][slot_idx][b] =
		( 0.5f * st_ivas->hSplitBinRend.hMultiBinCldfbData->Cldfb_RealBuffer_Binaural[n][slot_idx_start+slot_idx][b] ) +
		( 0.5f * Cldfb_RealBuffer[b] );

		st_ivas->hSplitBinRend.hMultiBinCldfbData->Cldfb_ImagBuffer_Binaural[n][slot_idx][b] =
		( 0.5f * st_ivas->hSplitBinRend.hMultiBinCldfbData->Cldfb_ImagBuffer_Binaural[n][slot_idx_start+slot_idx][b] ) +
		( 0.5f * Cldfb_ImagBuffer[b] );
		}
		}
		}
		}
		else
		{
		#endif

		if ( ( error = ivas_td_binaural_renderer_sf( st_ivas, output_f, *nSamplesRendered ) ) != IVAS_ERR_OK )
		{
		return error;
		@@ -151,6 +193,9 @@ ivas_error ivas_osba_dirac_td_binaural_jbm(
		output_f[n][i] = 0.5f * output_f[2 + n][i] + 0.5f * output_f[n][i];
		}
		}
		#ifdef OSBA_SPLIT_RENDERING
		}
		#endif

		return IVAS_ERR_OK;
		}