Loading lib_dec/ivas_stereo_dft_dec_fx.c +11 −12 Original line number Diff line number Diff line Loading @@ -898,7 +898,7 @@ void stereo_dft_dec_smooth_parameters_fx( Word32 diff_ipd; Word16 nbands; Word32 max_res_pred_ind; #ifdef FIX_874_INCREASE_ITD_PRECISION #ifdef FIX_874_INCREASE_IPD_PRECISION Word32 PI_round; #endif Loading @@ -906,7 +906,7 @@ void stereo_dft_dec_smooth_parameters_fx( move16(); k_offset = STEREO_DFT_OFFSET; move16(); #ifdef FIX_874_INCREASE_ITD_PRECISION #ifdef FIX_874_INCREASE_IPD_PRECISION PI_round = EVS_PI_FX_Q27 + EPSILLON_FX; /*add error corrections when comparing ipds with exactly a difference of pi*/ #endif Loading @@ -932,7 +932,7 @@ void stereo_dft_dec_smooth_parameters_fx( Word16 q_val; IF( GT_32( L_sub( hStereoDft->gipd_fx[add( k, k_offset )], hStereoDft->ipd_xfade_prev_fx ), EVS_PI_FX_Q27 ) ) { #ifdef FIX_874_INCREASE_ITD_PRECISION_A #ifdef FIX_874_INCREASE_IPD_PRECISION_A hStereoDft->ipd_xfade_target_fx = L_sub( hStereoDft->gipd_fx[add( k, k_offset )], EVS_PI_FX_Q27 << 1 ); #else hStereoDft->ipd_xfade_target_fx = L_sub( hStereoDft->gipd_fx[add( k, k_offset )], EVS_PI_FX_Q27 ); Loading @@ -955,7 +955,7 @@ void stereo_dft_dec_smooth_parameters_fx( } ELSE IF( GT_32( L_sub( hStereoDft->ipd_xfade_prev_fx, hStereoDft->gipd_fx[add( k, k_offset )] ), EVS_PI_FX_Q27 ) ) { #ifndef FIX_874_INCREASE_ITD_PRECISION_A #ifndef FIX_874_INCREASE_IPD_PRECISION_A hStereoDft->ipd_xfade_target_fx = L_add( hStereoDft->gipd_fx[add( k, k_offset )], L_shl( EVS_PI_FX_Q27, 1 ) ); #else hStereoDft->ipd_xfade_target_fx = L_add( hStereoDft->gipd_fx[add( k, k_offset )], EVS_PI_FX_Q27 <<1 ); Loading Loading @@ -1248,7 +1248,7 @@ void stereo_dft_dec_smooth_parameters_fx( /* Smoothing of IPDs*/ pgIpd = hStereoDft->gipd_fx + ( add( k, k_offset ) ); diff_ipd = L_sub( pgIpd[0], pgIpd[-hStereoDft->prm_res[add( k, k_offset )]] ); #ifndef FIX_874_INCREASE_ITD_PRECISION #ifndef FIX_874_INCREASE_IPD_PRECISION IF( LT_32( diff_ipd, -EVS_PI_FX_Q27 ) ) #else IF( LT_32( diff_ipd, -PI_round ) ) Loading @@ -1257,7 +1257,7 @@ void stereo_dft_dec_smooth_parameters_fx( pgIpd[0] = L_add( pgIpd[0], EVS_2PI_FX_Q27 ); move32(); } #ifndef FIX_874_INCREASE_ITD_PRECISION #ifndef FIX_874_INCREASE_IPD_PRECISION ELSE IF( GT_32( diff_ipd, EVS_PI_FX_Q27 ) ) #else ELSE IF( GT_32( diff_ipd, PI_round ) ) Loading Loading @@ -2473,13 +2473,13 @@ static void stereo_dft_compute_td_stefi_params_fx( static void stereo_dft_dequantize_ipd_fx( Word16 *ind, Word32 *out_fx, #ifndef FIX_874_INCREASE_ITD_PRECISION #ifndef FIX_874_INCREASE_IPD_PRECISION const Word16 N, #endif const Word16 bits ) { Word16 delta_fx; #ifndef FIX_874_INCREASE_ITD_PRECISION #ifndef FIX_874_INCREASE_IPD_PRECISION Word16 i; Word32 temp_out; #endif Loading @@ -2505,7 +2505,7 @@ static void stereo_dft_dequantize_ipd_fx( assert( 0 ); } #ifndef FIX_874_INCREASE_ITD_PRECISION #ifndef FIX_874_INCREASE_IPD_PRECISION FOR( i = 0; i < N; i++ ) { temp_out = L_sub( L_mult0( ind[i], delta_fx ), ( EVS_PI_FX ) ); Loading Loading @@ -3814,7 +3814,7 @@ void stereo_dft_dec_read_BS_fx( move16(); nb = add( nb, STEREO_DFT_GIPD_NBITS ); n_bits = add( n_bits, STEREO_DFT_GIPD_NBITS ); #ifndef FIX_874_INCREASE_ITD_PRECISION #ifndef FIX_874_INCREASE_IPD_PRECISION stereo_dft_dequantize_ipd_fx( &ind1_ipd[0], hStereoDft->gipd_fx + add( k, k_offset ), 1, STEREO_DFT_GIPD_NBITS ); #else stereo_dft_dequantize_ipd_fx( &ind1_ipd[0], hStereoDft->gipd_fx + add( k, k_offset ), STEREO_DFT_GIPD_NBITS ); Loading @@ -3834,7 +3834,7 @@ void stereo_dft_dec_read_BS_fx( move16(); nb = add( nb, STEREO_DFT_SID_GIPD_NBITS ); n_bits = add( n_bits, STEREO_DFT_SID_GIPD_NBITS ); #ifndef FIX_874_INCREASE_ITD_PRECISION #ifndef FIX_874_INCREASE_IPD_PRECISION stereo_dft_dequantize_ipd_fx( &ind1_ipd[0], hStereoDft->gipd_fx + add( k, k_offset ), 1, STEREO_DFT_SID_GIPD_NBITS ); #else stereo_dft_dequantize_ipd_fx( &ind1_ipd[0], hStereoDft->gipd_fx + add( k, k_offset ), STEREO_DFT_SID_GIPD_NBITS ); Loading @@ -3852,7 +3852,6 @@ void stereo_dft_dec_read_BS_fx( move16(); move16(); dbgwrite(hStereoDft->gipd_fx, sizeof(Word32), 3, 1, "res/gipd_fx"); /*------------------------------------------------------------------* * read Residual parameters *-----------------------------------------------------------------*/ Loading Loading
lib_dec/ivas_stereo_dft_dec_fx.c +11 −12 Original line number Diff line number Diff line Loading @@ -898,7 +898,7 @@ void stereo_dft_dec_smooth_parameters_fx( Word32 diff_ipd; Word16 nbands; Word32 max_res_pred_ind; #ifdef FIX_874_INCREASE_ITD_PRECISION #ifdef FIX_874_INCREASE_IPD_PRECISION Word32 PI_round; #endif Loading @@ -906,7 +906,7 @@ void stereo_dft_dec_smooth_parameters_fx( move16(); k_offset = STEREO_DFT_OFFSET; move16(); #ifdef FIX_874_INCREASE_ITD_PRECISION #ifdef FIX_874_INCREASE_IPD_PRECISION PI_round = EVS_PI_FX_Q27 + EPSILLON_FX; /*add error corrections when comparing ipds with exactly a difference of pi*/ #endif Loading @@ -932,7 +932,7 @@ void stereo_dft_dec_smooth_parameters_fx( Word16 q_val; IF( GT_32( L_sub( hStereoDft->gipd_fx[add( k, k_offset )], hStereoDft->ipd_xfade_prev_fx ), EVS_PI_FX_Q27 ) ) { #ifdef FIX_874_INCREASE_ITD_PRECISION_A #ifdef FIX_874_INCREASE_IPD_PRECISION_A hStereoDft->ipd_xfade_target_fx = L_sub( hStereoDft->gipd_fx[add( k, k_offset )], EVS_PI_FX_Q27 << 1 ); #else hStereoDft->ipd_xfade_target_fx = L_sub( hStereoDft->gipd_fx[add( k, k_offset )], EVS_PI_FX_Q27 ); Loading @@ -955,7 +955,7 @@ void stereo_dft_dec_smooth_parameters_fx( } ELSE IF( GT_32( L_sub( hStereoDft->ipd_xfade_prev_fx, hStereoDft->gipd_fx[add( k, k_offset )] ), EVS_PI_FX_Q27 ) ) { #ifndef FIX_874_INCREASE_ITD_PRECISION_A #ifndef FIX_874_INCREASE_IPD_PRECISION_A hStereoDft->ipd_xfade_target_fx = L_add( hStereoDft->gipd_fx[add( k, k_offset )], L_shl( EVS_PI_FX_Q27, 1 ) ); #else hStereoDft->ipd_xfade_target_fx = L_add( hStereoDft->gipd_fx[add( k, k_offset )], EVS_PI_FX_Q27 <<1 ); Loading Loading @@ -1248,7 +1248,7 @@ void stereo_dft_dec_smooth_parameters_fx( /* Smoothing of IPDs*/ pgIpd = hStereoDft->gipd_fx + ( add( k, k_offset ) ); diff_ipd = L_sub( pgIpd[0], pgIpd[-hStereoDft->prm_res[add( k, k_offset )]] ); #ifndef FIX_874_INCREASE_ITD_PRECISION #ifndef FIX_874_INCREASE_IPD_PRECISION IF( LT_32( diff_ipd, -EVS_PI_FX_Q27 ) ) #else IF( LT_32( diff_ipd, -PI_round ) ) Loading @@ -1257,7 +1257,7 @@ void stereo_dft_dec_smooth_parameters_fx( pgIpd[0] = L_add( pgIpd[0], EVS_2PI_FX_Q27 ); move32(); } #ifndef FIX_874_INCREASE_ITD_PRECISION #ifndef FIX_874_INCREASE_IPD_PRECISION ELSE IF( GT_32( diff_ipd, EVS_PI_FX_Q27 ) ) #else ELSE IF( GT_32( diff_ipd, PI_round ) ) Loading Loading @@ -2473,13 +2473,13 @@ static void stereo_dft_compute_td_stefi_params_fx( static void stereo_dft_dequantize_ipd_fx( Word16 *ind, Word32 *out_fx, #ifndef FIX_874_INCREASE_ITD_PRECISION #ifndef FIX_874_INCREASE_IPD_PRECISION const Word16 N, #endif const Word16 bits ) { Word16 delta_fx; #ifndef FIX_874_INCREASE_ITD_PRECISION #ifndef FIX_874_INCREASE_IPD_PRECISION Word16 i; Word32 temp_out; #endif Loading @@ -2505,7 +2505,7 @@ static void stereo_dft_dequantize_ipd_fx( assert( 0 ); } #ifndef FIX_874_INCREASE_ITD_PRECISION #ifndef FIX_874_INCREASE_IPD_PRECISION FOR( i = 0; i < N; i++ ) { temp_out = L_sub( L_mult0( ind[i], delta_fx ), ( EVS_PI_FX ) ); Loading Loading @@ -3814,7 +3814,7 @@ void stereo_dft_dec_read_BS_fx( move16(); nb = add( nb, STEREO_DFT_GIPD_NBITS ); n_bits = add( n_bits, STEREO_DFT_GIPD_NBITS ); #ifndef FIX_874_INCREASE_ITD_PRECISION #ifndef FIX_874_INCREASE_IPD_PRECISION stereo_dft_dequantize_ipd_fx( &ind1_ipd[0], hStereoDft->gipd_fx + add( k, k_offset ), 1, STEREO_DFT_GIPD_NBITS ); #else stereo_dft_dequantize_ipd_fx( &ind1_ipd[0], hStereoDft->gipd_fx + add( k, k_offset ), STEREO_DFT_GIPD_NBITS ); Loading @@ -3834,7 +3834,7 @@ void stereo_dft_dec_read_BS_fx( move16(); nb = add( nb, STEREO_DFT_SID_GIPD_NBITS ); n_bits = add( n_bits, STEREO_DFT_SID_GIPD_NBITS ); #ifndef FIX_874_INCREASE_ITD_PRECISION #ifndef FIX_874_INCREASE_IPD_PRECISION stereo_dft_dequantize_ipd_fx( &ind1_ipd[0], hStereoDft->gipd_fx + add( k, k_offset ), 1, STEREO_DFT_SID_GIPD_NBITS ); #else stereo_dft_dequantize_ipd_fx( &ind1_ipd[0], hStereoDft->gipd_fx + add( k, k_offset ), STEREO_DFT_SID_GIPD_NBITS ); Loading @@ -3852,7 +3852,6 @@ void stereo_dft_dec_read_BS_fx( move16(); move16(); dbgwrite(hStereoDft->gipd_fx, sizeof(Word32), 3, 1, "res/gipd_fx"); /*------------------------------------------------------------------* * read Residual parameters *-----------------------------------------------------------------*/ Loading