Minor cleanup (904e60ff) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_dec/ivas_objectRenderer_internal.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -77,6 +77,7 @@ ivas_error ivas_td_binaural_renderer(
		{
		#ifdef FIX_356_ISM_METADATA_SYNC
		int16_t ism_md_subframe_update;

		if ( st_ivas->hDecoderConfig->Opt_delay_comp )
		{
		ism_md_subframe_update = 1;
		@@ -121,7 +122,10 @@ void ObjRenderIVASSubframe(
		float *tc_local[MAX_TRANSPORT_CHANNELS];
		int16_t ch, slot_size, slots_to_render, output_frame;
		#ifdef FIX_356_ISM_METADATA_SYNC
		int16_t ism_md_subframe_update_jbm = 0; /* Number of subframes to delay metadata to sync with audio */
		int16_t ism_md_subframe_update_jbm; /* Number of subframes to delay metadata to sync with audio */

		ism_md_subframe_update_jbm = 0;

		#endif
		for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ )
		{

lib_dec/lib_dec.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -447,10 +447,11 @@ ivas_error IVAS_DEC_Configure(
		#endif
		const int16_t renderConfigEnabled, /* i : enable Renderer config. file for binaural output */
		const int16_t Opt_non_diegetic_pan, /* i : diegetic or not */
		const float non_diegetic_pan_gain /* i : non diegetic panning gain */
		#ifdef FIX_356_ISM_METADATA_SYNC
		,
		const float non_diegetic_pan_gain, /* i : non diegetic panning gain */
		const int16_t delayCompensationEnabled /* i : enable delay compensation */
		#else
		const float non_diegetic_pan_gain /* i : non diegetic panning gain */
		#endif
		)
		{

lib_dec/lib_dec.h

+4 −3

Original line number	Diff line number	Diff line
		@@ -152,10 +152,11 @@ ivas_error IVAS_DEC_Configure(
		#endif
		const int16_t renderConfigEnabled, /* i : enable Renderer config. file for binaural output */
		const int16_t Opt_non_diegetic_pan, /* i : diegetic or not */
		const float non_diegetic_pan_gain /* i : non diegetic panning gain */
		#ifdef FIX_356_ISM_METADATA_SYNC
		,
		const float non_diegetic_pan_gain, /* i : non diegetic panning gain */
		const int16_t delayCompensationEnabled /* i : enable delay compensation */
		#else
		const float non_diegetic_pan_gain /* i : non diegetic panning gain */
		#endif
		);

lib_rend/ivas_objectRenderer.c

+13 −10

Original line number	Diff line number	Diff line
		@@ -278,6 +278,9 @@ ivas_error ivas_td_binaural_renderer_unwrap(
		int16_t subframe_idx;
		float reverb_signal[BINAURAL_CHANNELS][L_FRAME48k];
		ivas_error error;
		#ifdef FIX_356_ISM_METADATA_SYNC
		int16_t c_indx, nS;
		#endif
		#ifdef JBM_TSM_ON_TCS
		float *p_reverb_signal[BINAURAL_CHANNELS];
		int16_t ch;
		@@ -291,9 +294,7 @@ ivas_error ivas_td_binaural_renderer_unwrap(
		subframe_length = output_frame / MAX_PARAM_SPATIAL_SUBFRAMES;

		#ifdef FIX_356_ISM_METADATA_SYNC
		int16_t c_indx, nS;
		c_indx = 0;

		for ( nS = 0; nS < num_src; nS++ )
		{
		if ( !( ivas_format == MC_FORMAT && nS == lfe_idx ) ) /* Skip LFE for MC */
		@@ -369,10 +370,11 @@ ivas_error TDREND_GetMix(
		float output[][L_FRAME48k], /* i/o: ISM object synth / rendered output in 0,1 */
		#endif
		const int16_t subframe_length, /* i/o: subframe length */
		const int16_t subframe_idx /* i : Subframe index to 5 ms subframe */
		#ifdef FIX_356_ISM_METADATA_SYNC
		,
		const int16_t subframe_idx, /* i : Subframe index to 5 ms subframe */
		const int16_t ism_md_subframe_update /* Number of subframes to delay ism metadata to sync with audio */
		#else
		const int16_t subframe_idx, /* i : Subframe index to 5 ms subframe */
		#endif
		)
		{
		@@ -386,9 +388,9 @@ ivas_error TDREND_GetMix(
		float hrf_right_delta[SFX_SPAT_BIN_MAX_FILTER_LENGTH];
		int16_t intp_count;
		float pan_left, pan_right;

		#ifdef FIX_356_ISM_METADATA_SYNC
		int16_t subframe_update_flag;

		subframe_update_flag = subframe_idx == ism_md_subframe_update;
		#endif

		@@ -415,13 +417,11 @@ ivas_error TDREND_GetMix(
		if ( ( SrcRend_p->PlayStatus == TDREND_PLAYSTATUS_PLAYING ) && ( hBinRendererTd->Listener_p->PoseUpdated \|\| SrcSpatial_p->Updated ) )
		{
		TDREND_SRC_REND_UpdateFiltersFromSpatialParams( hBinRendererTd, SrcRend_p, SrcSpatial_p, Src_p->hrf_left_prev,
		Src_p->hrf_right_prev, hrf_left_delta, hrf_right_delta, &intp_count, &Src_p->filterlength, &Src_p->itd, &Src_p->Gain, Src_p,
		#ifdef FIX_356_ISM_METADATA_SYNC
		subframe_update_flag
		Src_p->hrf_right_prev, hrf_left_delta, hrf_right_delta, &intp_count, &Src_p->filterlength, &Src_p->itd, &Src_p->Gain, Src_p, subframe_update_flag );
		#else
		subframe_idx
		Src_p->hrf_right_prev, hrf_left_delta, hrf_right_delta, &intp_count, &Src_p->filterlength, &Src_p->itd, &Src_p->Gain, Src_p, subframe_idx );
		#endif
		);
		}

		/* Render source if needed */
		@@ -691,7 +691,7 @@ ivas_error ivas_td_binaural_renderer_ext(
		AUDIO_CONFIG transport_config;
		ivas_error error;
		#ifdef FIX_356_ISM_METADATA_SYNC
		int16_t ism_md_subframe_update_ext = 0;
		int16_t ism_md_subframe_update_ext;
		#endif
		#ifdef JBM_TSM_ON_TCS
		float *p_output[MAX_OUTPUT_CHANNELS];
		@@ -708,6 +708,9 @@ ivas_error ivas_td_binaural_renderer_ext(
		inConfigType = getAudioConfigType( inConfig );
		lfe_idx = LFE_CHANNEL;
		hIsmMetaData[0] = NULL;
		#ifdef FIX_356_ISM_METADATA_SYNC
		ism_md_subframe_update_ext = 0;
		#endif

		if ( inConfigType == IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED )
		{

lib_rend/ivas_prot_rend.h

+3 −2

Original line number	Diff line number	Diff line
		@@ -291,10 +291,11 @@ ivas_error TDREND_GetMix(
		float output[][L_FRAME48k], /* i/o: ISM object synth / rendered output in 0,1 */
		#endif
		const int16_t subframe_length, /* i/o: subframe length */
		const int16_t subframe_idx /* i : Subframe index to 5 ms subframe */
		#ifdef FIX_356_ISM_METADATA_SYNC
		,
		const int16_t subframe_idx, /* i : Subframe index to 5 ms subframe */
		const int16_t ism_md_subframe_update /* Number of subframes to delay metadata to sync with audio */
		#else
		const int16_t subframe_idx /* i : Subframe index to 5 ms subframe */
		#endif
		);