formatting (4b1ac279) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_dec/ivas_mc_paramupmix_dec.c

+16 −17

Original line number	Diff line number	Diff line
		@@ -153,7 +153,6 @@ void ivas_mc_paramupmix_dec_read_BS(
		}

		pop_wmops();

		return;
		}

		@@ -211,7 +210,6 @@ void ivas_mc_paramupmix_dec(

		hMCParamUpmix = st_ivas->hMCParamUpmix;
		assert( hMCParamUpmix );

		push_wmops( "mc_paramupmix_dec" );

		set_s( channel_active, 0, MAX_CICP_CHANNELS );
		@@ -369,20 +367,20 @@ void ivas_mc_paramupmix_dec(
		#endif

		/* Implement binaural rendering */
		ivas_binRenderer( st_ivas->hBinRenderer,
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		&st_ivas->hSplitBinRend.splitrend.multiBinPoseData,

		#ifdef SPLIT_REND_WITH_HEAD_ROT_DEBUG
		ivas_binRenderer( st_ivas->hBinRenderer, &st_ivas->hSplitBinRend.splitrend.multiBinPoseData, st_ivas->hCombinedOrientationData, subframeIdx, /* TODO (5ms) : tmu2Dlb please verify */ JBM_CLDFB_SLOTS_IN_SUBFRAME, NULL, Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural, Cldfb_RealBuffer_subfr, Cldfb_ImagBuffer_subfr );
		#else
		ivas_binRenderer( st_ivas->hBinRenderer, &st_ivas->hSplitBinRend.splitrend.multiBinPoseData, st_ivas->hCombinedOrientationData, subframeIdx, /* TODO (5ms) : tmu2Dlb please verify */ JBM_CLDFB_SLOTS_IN_SUBFRAME, Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural, Cldfb_RealBuffer_subfr, Cldfb_ImagBuffer_subfr );
		#endif
		st_ivas->hCombinedOrientationData,
		subframeIdx, /* TODO (5ms) : tmu2Dlb please verify */
		JBM_CLDFB_SLOTS_IN_SUBFRAME,
		#else
		ivas_binRenderer( st_ivas->hBinRenderer, st_ivas->hCombinedOrientationData, subframeIdx, /* TODO (5ms) : tmu2Dlb please verify */ JBM_CLDFB_SLOTS_IN_SUBFRAME,
		#ifdef SPLIT_REND_WITH_HEAD_ROT_DEBUG
		NULL,
		#endif
		Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural,
		Cldfb_RealBuffer_subfr,
		Cldfb_ImagBuffer_subfr );

		Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural, Cldfb_RealBuffer_subfr, Cldfb_ImagBuffer_subfr );
		#endif

		#ifdef SPLIT_REND_WITH_HEAD_ROT
		if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
		@@ -492,7 +490,6 @@ void ivas_mc_paramupmix_dec(
		}

		pop_wmops();

		return;
		}

		@@ -512,7 +509,6 @@ void ivas_mc_paramupmix_dec_digest_tc(
		MC_PARAMUPMIX_DEC_HANDLE hMCParamUpmix;
		hMCParamUpmix = st_ivas->hMCParamUpmix;
		assert( hMCParamUpmix );

		push_wmops( "ivas_mc_paramupmix_dec_digest_tc" );

		ivas_param_upmix_dec_decorr_subframes( st_ivas, nSamplesForRendering );
		@@ -523,6 +519,7 @@ void ivas_mc_paramupmix_dec_digest_tc(
		ivas_jbm_dec_get_adapted_linear_interpolator( DEFAULT_JBM_CLDFB_TIMESLOTS, nCldfbSlots, hMCParamUpmix->param_interpolator );

		pop_wmops();
		return;
		}


		@@ -618,6 +615,7 @@ void ivas_mc_paramupmix_dec_render(
		nSamplesAvailable = ( st_ivas->hTcBuffer->num_slots - st_ivas->hTcBuffer->slots_rendered ) slot_size;

		pop_wmops();
		return;
		}


		@@ -886,10 +884,10 @@ static void ivas_param_upmix_dec_decorr_subframes(
		}

		pop_wmops();

		return;
		}


		/*****************************************************************************************/
		/* local functions */
		/*****************************************************************************************/
		@@ -1118,6 +1116,7 @@ static void ivas_mc_paramupmix_dec_sf(
		}
		}
		}

		if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV \|\| st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )
		{
		maxBand = (int16_t) ( ( CLDFB_NO_CHANNELS_MAX * st_ivas->hDecoderConfig->output_Fs ) / 48000 );
		@@ -1199,7 +1198,6 @@ static void ivas_mc_paramupmix_dec_sf(
		#else
		ivas_binRenderer( st_ivas->hBinRenderer, st_ivas->hCombinedOrientationData, subframeIdx,
		st_ivas->hTcBuffer->subframe_nbslots[subframeIdx], Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural, Cldfb_RealBuffer_subfr, Cldfb_ImagBuffer_subfr );

		#endif

		#ifdef SPLIT_REND_WITH_HEAD_ROT
		@@ -1296,6 +1294,7 @@ static void ivas_mc_paramupmix_dec_sf(
		st_ivas->hTcBuffer->subframes_rendered++;

		pop_wmops();
		return;
		}