Merge branch 'main' into... (4f89cb4e) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -3366,14 +3366,10 @@ static ivas_error decodeVoIP(
		}
		vec_pos_update = ( vec_pos_update + 1 ) % vec_pos_len;
		frame++;
		#ifdef NONBE_FIX_864_JBM_RENDER_FRAMESIZE
		if ( vec_pos_update == 0 )
		{
		systemTime_ms += vec_pos_len * systemTimeInc_ms;
		}
		#else
		systemTime_ms += systemTimeInc_ms;
		#endif

		#ifdef WMOPS
		update_mem();
		@@ -3382,7 +3378,6 @@ static ivas_error decodeVoIP(
		}


		#ifdef NONBE_FIX_864_JBM_RENDER_FRAMESIZE
		int16_t nSamplesFlushed = 0;

		/* decode and get samples */
		@@ -3460,7 +3455,6 @@ static ivas_error decodeVoIP(
		}
		}
		}
		#endif

		/------------------------------------------------------------------------------------------
		* Add zeros at the end to have equal length of synthesized signals

lib_com/ivas_prot.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -769,9 +769,7 @@ void dtx_read_padding_bits(
		);

		void ivas_apply_non_diegetic_panning(
		#ifdef FIX_1009_ISM_NONDIEGETIC_PANNING
		float input_f, / i : non-diegetic object */
		#endif
		float output_f[], / o : core-coder transport mono channel/stereo output */
		const float non_diegetic_pan_gain, /* i : non-diegetic panning gain */
		const int16_t output_frame /* i : output frame length per channel */

lib_com/ivas_stat_com.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -242,7 +242,6 @@ typedef struct ivas_spar_md_com_cfg
		int16_t max_bits_per_blk;
		int16_t prev_quant_idx;
		int16_t agc_bits_ch_idx;
		int16_t planarCP;
		int16_t num_umx_chs;
		int16_t max_md_bits_spar;

lib_com/options.h

+1 −6

Original line number	Diff line number	Diff line
		@@ -156,8 +156,7 @@
		/#define FIX_I4_OL_PITCH/ /* fix open-loop pitch used for EVS core switching */
		/#define SPLIT_REND_WITH_HEAD_ROT / /* Dlb,FhG: Split Rendering contributions 21 and 35 */

		#define FIX_998_UNUSED_FUNCTION /* FhG: issue 998: delete unused funtion ivas_dirac_dec_get_response_split_order */
		#define FIX_1009_ISM_NONDIEGETIC_PANNING /* FhG: issue #1009: use correct object buffer for ISM1 non-diegetic pan */
		#define FIX_1020_AEID_SELECTION_ERRORS /* Philips: issue #1020: fix for acoustic environment ID selection errors */
		#define FIX_993_REMOVE_SBA_GET_ORDER /* VA: issue 993: remove unused function ivas_sba_get_order() */
		#define FIX_1002_DEC_PHASE_ECU_USAN_OF_PHASE /* Eri: issue #1002, usan-value-out-of-range-for-int16, kept BE for PLC-conditions */
		#define FIX_960_SYN_OUTPUT /* VA: issue 960: unused function syn_output() is removed */
		@@ -169,10 +168,6 @@
		/* any switch which is non-be wrt selection floating point code */
		/* all switches in this category should start with "NONBE_" */

		#define NONBE_FIX_864_JBM_RENDER_FRAMESIZE /* FhG: issue #864: fix different behaviour of JBM TSM with different render frame sizes */
		#define NONBE_FIX_1012_1013_JBM_FLUSH_BUFFER /* FhG: issues #1012, 1013: JBM flush function uses wrong output buffer */
		#define NONBE_FIX_1004_USAN_DTX_MASA_NO_DIRS /* Nokia: fix USAN error caused by non-setting of correctly the number of MASA directions in DTX */
		#define NONBE_FIX_1014_1015_1016_OSBA_JBM_STEREO /* FhG: issues #1014, #1015, #1016: fix tc buffer info update in the discrete ism renderer */
		#define NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING /* FhG: issue 987: solution b: downmix HOA3 to stereo a input for the reverberator */
		#define NONBE_FIX_1006_PAST_DMX_NRG_ERROR /* Eri/FhG: Issue 1006: Bug fix in ivas_stereo_dft_dec not replicated in ivas_stereo_dft_dec_dmx */
		#define NONBE_FIX_1010_STEREO_CNG_DIV_BY_ZERO /* Eri: Issue 1010: Division by zero in Stereo CNG */

lib_dec/ivas_dirac_dec.c

+0 −73

Original line number	Diff line number	Diff line
		@@ -1840,25 +1840,6 @@ void ivas_dirac_dec_render_sf(
		set_zero( surCohRatio, hSpatParamRendCom->num_freq_bands );
		}
		}
		#ifndef FIX_998_UNUSED_FUNCTION

		if ( st_ivas->hCombinedOrientationData && st_ivas->hCombinedOrientationData->enableCombinedOrientation[st_ivas->hCombinedOrientationData->subframe_idx] && st_ivas->hCombinedOrientationData->shd_rot_max_order == 1 )
		{
		ivas_dirac_dec_compute_directional_responses( hSpatParamRendCom,
		hDirACRend,
		st_ivas->hVBAPdata,
		st_ivas->hMasa == NULL ? NULL : st_ivas->hMasa->data.band_mapping,
		st_ivas->hMasaIsmData,
		azimuth,
		elevation,
		md_idx,
		surCohRatio,
		st_ivas->hCombinedOrientationData->shd_rot_max_order,
		p_Rmat,
		hodirac_flag );
		}
		else
		{
		ivas_dirac_dec_compute_directional_responses( hSpatParamRendCom,
		hDirACRend,
		st_ivas->hVBAPdata,
		@@ -1868,23 +1849,8 @@ void ivas_dirac_dec_render_sf(
		elevation,
		md_idx,
		surCohRatio,
		0,
		NULL,
		hodirac_flag );
		}
		#else
		ivas_dirac_dec_compute_directional_responses( hSpatParamRendCom,
		hDirACRend,
		st_ivas->hVBAPdata,
		st_ivas->hMasa == NULL ? NULL : st_ivas->hMasa->data.band_mapping,
		st_ivas->hMasaIsmData,
		azimuth,
		elevation,
		md_idx,
		surCohRatio,
		hodirac_flag );
		#endif
		}

		if ( st_ivas->ivas_format == MASA_ISM_FORMAT && nchan_transport == 2 )
		{
		@@ -2213,27 +2179,6 @@ void ivas_dirac_dec_render_sf(
		}

		/Compute PSDs/
		#ifndef FIX_998_UNUSED_FUNCTION
		if ( st_ivas->hCombinedOrientationData && st_ivas->hCombinedOrientationData->enableCombinedOrientation[st_ivas->hCombinedOrientationData->subframe_idx] && st_ivas->hCombinedOrientationData->shd_rot_max_order > 0 )
		{
		ivas_dirac_dec_output_synthesis_process_slot( reference_power,
		p_onset_filter,
		azimuth,
		elevation,
		hSpatParamRendCom->diffuseness_vector[md_idx],
		hSpatParamRendCom,
		hDirACRend,
		st_ivas->hCombinedOrientationData->shd_rot_max_order,
		p_Rmat,
		st_ivas->hVBAPdata,
		hDirACRend->hOutSetup,
		nchan_transport,
		md_idx,
		hodirac_flag,
		hDirAC->hConfig->dec_param_estim );
		}
		else
		{
		ivas_dirac_dec_output_synthesis_process_slot( reference_power,
		p_onset_filter,
		azimuth,
		@@ -2241,30 +2186,12 @@ void ivas_dirac_dec_render_sf(
		hSpatParamRendCom->diffuseness_vector[md_idx],
		hSpatParamRendCom,
		hDirACRend,
		0,
		0,
		st_ivas->hVBAPdata,
		hDirACRend->hOutSetup,
		nchan_transport,
		md_idx,
		hodirac_flag,
		hDirAC->hConfig->dec_param_estim );
		}
		#else
		ivas_dirac_dec_output_synthesis_process_slot( reference_power,
		p_onset_filter,
		azimuth,
		elevation,
		hSpatParamRendCom->diffuseness_vector[md_idx],
		hSpatParamRendCom,
		hDirACRend,
		st_ivas->hVBAPdata,
		hDirACRend->hOutSetup,
		nchan_transport,
		md_idx,
		hodirac_flag,
		hDirAC->hConfig->dec_param_estim );
		#endif

		if ( hDirAC->hConfig->dec_param_estim )
		{