disable FIX_867 (39ad4a8f) · Commits · SA4 / Audio / IVAS BASOP

lib_com/ivas_dirac_com.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1127,7 +1127,7 @@ void computeDiffuseness_fixed(
		q_diffuseness = add(q_diffuseness, exp1);
		#endif

		#ifdef FIX_867
		#ifdef FIX_867_DBG
		FOR( Word16 l = 0; l < num_freq_bands; l++ )
		{
		static FILE *f = 0;

lib_com/options.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -118,7 +118,7 @@
		#define FIX_ISSUE_1152 /* Ittiam: Fix for issue 1152: Assertion error observed in evs_enc_fx (with option stereo_dmx_evs) from find_tilt_fx function*/
		#define FIX_ISSUE_1156 /* Ittiam: Fix for Issue 1156: Encoder crash for Stereo at 32kbps in SWB_BWE_encoding_ivas_fx() */

		#define FIX_867
		#define FIX_867_DBG
		//#define FIX_867
		//#define FIX_867_DBG

		#endif

lib_dec/ivas_dirac_dec.c

+1 −7

Original line number	Diff line number	Diff line
		@@ -3122,13 +3122,7 @@ void ivas_dirac_dec_render_sf_fx(
		#endif
		move16();

		computeDiffuseness_fixed( hDirACRend->buffer_intensity_real_fx,
		hDirACRend->buffer_energy_fx,
		num_freq_bands,
		hSpatParamRendCom->diffuseness_vector_fx[md_idx],
		hDirACRend->q_buffer_intensity_real,
		hDirACRend->q_buffer_energy,
		&hSpatParamRendCom->q_diffuseness_vector );
		computeDiffuseness_fixed( hDirACRend->buffer_intensity_real_fx, hDirACRend->buffer_energy_fx, num_freq_bands, hSpatParamRendCom->diffuseness_vector_fx[md_idx], hDirACRend->q_buffer_intensity_real, hDirACRend->q_buffer_energy, &hSpatParamRendCom->q_diffuseness_vector );
		}

		/-----------------------------------------------------------------

lib_rend/ivas_dirac_output_synthesis_dec.c

+13 −17

Original line number	Diff line number	Diff line
		@@ -908,6 +908,7 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
		num_freq_bands ); /h_dirac_output_synthesis_state->diffuse_power_factor_q+Q31-Q31->h_dirac_output_synthesis_state->diffuse_power_factor_q/

		/Direct gain/

		#ifndef FIX_867
		Word16 Q_temp_cy_cross_dir_smooth_fx = (Word16 ) malloc( num_freq_bands * num_channels_dir * sizeof( Word16 ) );
		tmp16 = imult1616( num_freq_bands, num_channels_dir );
		@@ -1130,8 +1131,7 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
		}
		ELSE
		{
		h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] =
		L_add( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sqr ); /Q(31- sqr_exp)/
		h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = L_add( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sqr ); /Q(31- sqr_exp)/
		move32();
		#ifdef FIX_867
		h_dirac_output_synthesis_state->q_cy_cross_dir_smooth[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );
		@@ -1199,8 +1199,7 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
		move32();
		h_dirac_output_synthesis_state->q_cy_cross_dir_smooth[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );
		#else
		h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] =
		L_add( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sqr ); /Q(31-sqr_exp)/
		h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = L_add( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sqr ); /Q(31-sqr_exp)/
		move32();
		Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );
		move16();
		@@ -1244,15 +1243,12 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
		move16();
		}
		#endif
		h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] =
		L_add( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sqr );
		/Q_temp_cy_cross_dir_smooth_fx[ch_idx num_freq_bands + k]*/
		h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = L_add( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sqr ); /Q_temp_cy_cross_dir_smooth_fx[ch_idx num_freq_bands + k]*/
		move32();
		}
		ELSE
		{
		h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] =
		L_add( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sqr ); /Q(31-sqr_exp)/
		h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = L_add( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sqr ); /Q(31-sqr_exp)/
		move32();
		#ifdef FIX_867
		h_dirac_output_synthesis_state->q_cy_cross_dir_smooth[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );