rename "splitBinRend" to "hsplitBinRend" (33176a6a) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_dec/ivas_binRenderer_internal.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -835,9 +835,9 @@ ivas_error ivas_binRenderer_open(
		( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )
		{
		#ifdef SPLIT_REND_WITH_HEAD_ROT_DEBUG
		hBinRenderer->numPoses = st_ivas->splitBinRend.splitrend.multiBinPoseData.num_poses + 1;
		hBinRenderer->numPoses = st_ivas->hsplitBinRend.splitrend.multiBinPoseData.num_poses + 1;
		#else
		hBinRenderer->numPoses = st_ivas->splitBinRend.splitrend.multiBinPoseData.num_poses;
		hBinRenderer->numPoses = st_ivas->hsplitBinRend.splitrend.multiBinPoseData.num_poses;
		#endif
		}
		else
		@@ -1315,7 +1315,7 @@ void ivas_binaural_cldfb(
		/* Implement binaural rendering */
		ivas_binRenderer( st_ivas->hBinRenderer,
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		&st_ivas->splitBinRend.splitrend.multiBinPoseData,
		&st_ivas->hsplitBinRend.splitrend.multiBinPoseData,
		#endif
		st_ivas->hCombinedOrientationData,
		subframeIdx, JBM_CLDFB_SLOTS_IN_SUBFRAME,
		@@ -1437,7 +1437,7 @@ void ivas_binaural_cldfb_sf(
		/* Implement binaural rendering */
		ivas_binRenderer( st_ivas->hBinRenderer,
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		&st_ivas->splitBinRend.splitrend.multiBinPoseData,
		&st_ivas->hsplitBinRend.splitrend.multiBinPoseData,
		#endif
		st_ivas->hCombinedOrientationData, subframeIdx, st_ivas->hTcBuffer->subframe_nbslots[subframeIdx], Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural, Cldfb_RealBuffer, Cldfb_ImagBuffer );

lib_dec/ivas_dec.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -128,7 +128,7 @@ ivas_error ivas_dec(
		( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode != MC_MODE_MCMASA ) ) &&
		( output_Fs == 48000 ) && "split binaural mode is currently supported with SBA, discrete ISM, or MCT-MC formats and 48 kHz sampling rate only" );

		ivas_set_split_rend_setup( &st_ivas->splitBinRend, &st_ivas->hRenderConfig->split_rend_config, st_ivas->hCombinedOrientationData, hSplitRendBits );
		ivas_set_split_rend_setup( &st_ivas->hsplitBinRend, &st_ivas->hRenderConfig->split_rend_config, st_ivas->hCombinedOrientationData, hSplitRendBits );
		}
		#endif

		@@ -528,7 +528,7 @@ ivas_error ivas_dec(
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		if ( output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
		{
		if ( ( error = ivas_rend_crendProcessSplitBin( st_ivas->hCrendWrapper, st_ivas->intern_config, st_ivas->hOutSetup.output_config, &st_ivas->splitBinRend.splitrend.multiBinPoseData, st_ivas->hDecoderConfig,
		if ( ( error = ivas_rend_crendProcessSplitBin( st_ivas->hCrendWrapper, st_ivas->intern_config, st_ivas->hOutSetup.output_config, &st_ivas->hsplitBinRend.splitrend.multiBinPoseData, st_ivas->hDecoderConfig,
		st_ivas->hCombinedOrientationData, &st_ivas->hIntSetup, st_ivas->hEFAPdata, p_output, output_Fs ) ) != IVAS_ERR_OK )
		{
		return error;
		@@ -628,7 +628,7 @@ ivas_error ivas_dec(
		st_ivas->hCrendWrapper,
		st_ivas->intern_config,
		st_ivas->hOutSetup.output_config,
		&st_ivas->splitBinRend.splitrend.multiBinPoseData,
		&st_ivas->hsplitBinRend.splitrend.multiBinPoseData,
		st_ivas->hDecoderConfig,
		st_ivas->hCombinedOrientationData,
		&st_ivas->hIntSetup,
		@@ -838,7 +838,7 @@ ivas_error ivas_dec(
		IVAS_DEC_SPLIT_REND_WRAPPER *hSplitBinRend;
		int16_t max_band;
		int16_t pcm_out;
		hSplitBinRend = &st_ivas->splitBinRend;
		hSplitBinRend = &st_ivas->hsplitBinRend;
		max_band = (int16_t) ( ( BINAURAL_MAXBANDS * output_Fs ) / 48000 );
		pcm_out = ( output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ? 1 : 0;

		@@ -848,7 +848,7 @@ ivas_error ivas_dec(
		return error;
		}

		free( st_ivas->splitBinRend.hMultiBinCldfbData );
		free( st_ivas->hsplitBinRend.hMultiBinCldfbData );
		}
		#endif

lib_dec/ivas_dirac_dec.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -2318,7 +2318,7 @@ void ivas_dirac_dec_render_sf(
		/* Perform binaural rendering */
		ivas_binRenderer( st_ivas->hBinRenderer,
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		&st_ivas->splitBinRend.splitrend.multiBinPoseData,
		&st_ivas->hsplitBinRend.splitrend.multiBinPoseData,
		#endif
		st_ivas->hCombinedOrientationData,
		subframe_idx,
		@@ -2343,8 +2343,8 @@ void ivas_dirac_dec_render_sf(
		{
		for ( ch = 0; ch < st_ivas->hDecoderConfig->nchan_out; ch++ )
		{
		mvr2r( Cldfb_RealBuffer_Binaural[pos_idx][ch][slot_idx], st_ivas->splitBinRend.hMultiBinCldfbData->Cldfb_RealBuffer_Binaural[( pos_idx * BINAURAL_CHANNELS ) + ch][slot_idx_start + slot_idx], hSpatParamRendCom->num_freq_bands );
		mvr2r( Cldfb_ImagBuffer_Binaural[pos_idx][ch][slot_idx], st_ivas->splitBinRend.hMultiBinCldfbData->Cldfb_ImagBuffer_Binaural[( pos_idx * BINAURAL_CHANNELS ) + ch][slot_idx_start + slot_idx], hSpatParamRendCom->num_freq_bands );
		mvr2r( Cldfb_RealBuffer_Binaural[pos_idx][ch][slot_idx], st_ivas->hsplitBinRend.hMultiBinCldfbData->Cldfb_RealBuffer_Binaural[( pos_idx * BINAURAL_CHANNELS ) + ch][slot_idx_start + slot_idx], hSpatParamRendCom->num_freq_bands );
		mvr2r( Cldfb_ImagBuffer_Binaural[pos_idx][ch][slot_idx], st_ivas->hsplitBinRend.hMultiBinCldfbData->Cldfb_ImagBuffer_Binaural[( pos_idx * BINAURAL_CHANNELS ) + ch][slot_idx_start + slot_idx], hSpatParamRendCom->num_freq_bands );
		}
		}
		}

lib_dec/ivas_init_dec.c

+11 −11

Original line number	Diff line number	Diff line
		@@ -1286,7 +1286,7 @@ ivas_error ivas_init_decoder(
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
		{
		ivas_renderSplitGetMultiBinPoseData( &st_ivas->hRenderConfig->split_rend_config, &st_ivas->splitBinRend.splitrend.multiBinPoseData, st_ivas->hHeadTrackData->sr_pose_pred_axis );
		ivas_renderSplitGetMultiBinPoseData( &st_ivas->hRenderConfig->split_rend_config, &st_ivas->hsplitBinRend.splitrend.multiBinPoseData, st_ivas->hHeadTrackData->sr_pose_pred_axis );
		}
		#endif

		@@ -1300,7 +1300,7 @@ ivas_error ivas_init_decoder(
		{
		ivas_split_rend_choose_default_codec( &st_ivas->hRenderConfig->split_rend_config.codec, 0, ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ? 1 : 0 );

		if ( ( error = ivas_split_renderer_open( &st_ivas->splitBinRend.splitrend, &st_ivas->hRenderConfig->split_rend_config, hDecoderConfig->output_Fs, 1, ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ? 1 : 0 ) ) != IVAS_ERR_OK )
		if ( ( error = ivas_split_renderer_open( &st_ivas->hsplitBinRend.splitrend, &st_ivas->hRenderConfig->split_rend_config, hDecoderConfig->output_Fs, 1, ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ? 1 : 0 ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		@@ -1345,9 +1345,9 @@ ivas_error ivas_init_decoder(
		{
		ivas_split_rend_choose_default_codec( &st_ivas->hRenderConfig->split_rend_config.codec, 1, ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ? 1 : 0 );

		ivas_renderSplitGetMultiBinPoseData( &st_ivas->hRenderConfig->split_rend_config, &st_ivas->splitBinRend.splitrend.multiBinPoseData, st_ivas->hHeadTrackData->sr_pose_pred_axis );
		ivas_renderSplitGetMultiBinPoseData( &st_ivas->hRenderConfig->split_rend_config, &st_ivas->hsplitBinRend.splitrend.multiBinPoseData, st_ivas->hHeadTrackData->sr_pose_pred_axis );

		if ( ( error = ivas_split_renderer_open( &st_ivas->splitBinRend.splitrend, &st_ivas->hRenderConfig->split_rend_config, hDecoderConfig->output_Fs, 0, ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ? 1 : 0 ) ) != IVAS_ERR_OK )
		if ( ( error = ivas_split_renderer_open( &st_ivas->hsplitBinRend.splitrend, &st_ivas->hRenderConfig->split_rend_config, hDecoderConfig->output_Fs, 0, ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ? 1 : 0 ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		@@ -1397,14 +1397,14 @@ ivas_error ivas_init_decoder(
		pcm_out = ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ? 1 : 0;
		ivas_split_rend_choose_default_codec( &st_ivas->hRenderConfig->split_rend_config.codec, 1, pcm_out );

		ivas_renderSplitGetMultiBinPoseData( &st_ivas->hRenderConfig->split_rend_config, &st_ivas->splitBinRend.splitrend.multiBinPoseData, st_ivas->hHeadTrackData->sr_pose_pred_axis );
		ivas_renderSplitGetMultiBinPoseData( &st_ivas->hRenderConfig->split_rend_config, &st_ivas->hsplitBinRend.splitrend.multiBinPoseData, st_ivas->hHeadTrackData->sr_pose_pred_axis );

		if ( ( error = ivas_split_renderer_open( &st_ivas->splitBinRend.splitrend, &st_ivas->hRenderConfig->split_rend_config, hDecoderConfig->output_Fs, 0, pcm_out ) ) != IVAS_ERR_OK )
		if ( ( error = ivas_split_renderer_open( &st_ivas->hsplitBinRend.splitrend, &st_ivas->hRenderConfig->split_rend_config, hDecoderConfig->output_Fs, 0, pcm_out ) ) != IVAS_ERR_OK )
		{
		return error;
		}

		num_poses = st_ivas->splitBinRend.splitrend.multiBinPoseData.num_poses;
		num_poses = st_ivas->hsplitBinRend.splitrend.multiBinPoseData.num_poses;
		}
		else
		{
		@@ -1792,9 +1792,9 @@ void ivas_initialize_handles_dec(
		/* rendering handles */
		st_ivas->hBinRenderer = NULL;
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		st_ivas->splitBinRend.hMultiBinCldfbData = NULL;
		st_ivas->splitBinRend.hSplitRendBits = NULL;
		ivas_init_split_rend_handles( &st_ivas->splitBinRend.splitrend );
		st_ivas->hsplitBinRend.hMultiBinCldfbData = NULL;
		st_ivas->hsplitBinRend.hSplitRendBits = NULL;
		ivas_init_split_rend_handles( &st_ivas->hsplitBinRend.splitrend );
		#endif
		st_ivas->hDiracDecBin = NULL;
		st_ivas->hDirACRend = NULL;
		@@ -1957,7 +1957,7 @@ void ivas_destroy_dec(

		#ifdef SPLIT_REND_WITH_HEAD_ROT
		/* Split binaural renderer handle */
		ivas_split_renderer_close( &st_ivas->splitBinRend.splitrend );
		ivas_split_renderer_close( &st_ivas->hsplitBinRend.splitrend );
		#endif

		/* Parametric binaural renderer handle */

lib_dec/ivas_mc_param_dec.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1756,7 +1756,7 @@ void ivas_param_mc_dec_render(
		{
		ivas_binRenderer( st_ivas->hBinRenderer,
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		&st_ivas->splitBinRend.splitrend.multiBinPoseData,
		&st_ivas->hsplitBinRend.splitrend.multiBinPoseData,
		#endif
		st_ivas->hCombinedOrientationData, subframe_idx,
		hParamMC->subframe_nbslots[subframe_idx],
		@@ -1776,8 +1776,8 @@ void ivas_param_mc_dec_render(
		{
		for ( ch = 0; ch < nchan_out_cldfb; ch++ )
		{
		mvr2r( Cldfb_RealBuffer_Binaural[pos_idx][ch][slot_idx], st_ivas->splitBinRend.hMultiBinCldfbData->Cldfb_RealBuffer_Binaural[( pos_idx * BINAURAL_CHANNELS ) + ch][slot_idx_start + slot_idx], hParamMC->num_freq_bands );
		mvr2r( Cldfb_ImagBuffer_Binaural[pos_idx][ch][slot_idx], st_ivas->splitBinRend.hMultiBinCldfbData->Cldfb_ImagBuffer_Binaural[( pos_idx * BINAURAL_CHANNELS ) + ch][slot_idx_start + slot_idx], hParamMC->num_freq_bands );
		mvr2r( Cldfb_RealBuffer_Binaural[pos_idx][ch][slot_idx], st_ivas->hsplitBinRend.hMultiBinCldfbData->Cldfb_RealBuffer_Binaural[( pos_idx * BINAURAL_CHANNELS ) + ch][slot_idx_start + slot_idx], hParamMC->num_freq_bands );
		mvr2r( Cldfb_ImagBuffer_Binaural[pos_idx][ch][slot_idx], st_ivas->hsplitBinRend.hMultiBinCldfbData->Cldfb_ImagBuffer_Binaural[( pos_idx * BINAURAL_CHANNELS ) + ch][slot_idx_start + slot_idx], hParamMC->num_freq_bands );
		}
		}
		}