diff options
author | Timothy B. Terriberry <tterribe@xiph.org> | 2014-10-03 21:49:57 -0700 |
---|---|---|
committer | Timothy B. Terriberry <tterribe@xiph.org> | 2014-10-03 21:49:57 -0700 |
commit | 554b349cdb50c15a227407d2845787e4c940651b (patch) | |
tree | 93280addec7da80814403c7a0352c19032bd1270 /silk/float | |
parent | 020a0a48d5fdbfae76b2db26ad5d65c39efad6ad (diff) | |
download | opus-554b349cdb50c15a227407d2845787e4c940651b.tar.gz |
There are no tabs in source code.
There is also no trailing whitespace.
Diffstat (limited to 'silk/float')
-rw-r--r-- | silk/float/find_LPC_FLP.c | 2 | ||||
-rw-r--r-- | silk/float/find_pred_coefs_FLP.c | 4 | ||||
-rw-r--r-- | silk/float/pitch_analysis_core_FLP.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/silk/float/find_LPC_FLP.c b/silk/float/find_LPC_FLP.c index 61c1ad95..fcfe1c36 100644 --- a/silk/float/find_LPC_FLP.c +++ b/silk/float/find_LPC_FLP.c @@ -99,6 +99,6 @@ void silk_find_LPC_FLP( silk_A2NLSF_FLP( NLSF_Q15, a, psEncC->predictLPCOrder ); } - silk_assert( psEncC->indices.NLSFInterpCoef_Q2 == 4 || + silk_assert( psEncC->indices.NLSFInterpCoef_Q2 == 4 || ( psEncC->useInterpolatedNLSFs && !psEncC->first_frame_after_reset && psEncC->nb_subfr == MAX_NB_SUBFR ) ); } diff --git a/silk/float/find_pred_coefs_FLP.c b/silk/float/find_pred_coefs_FLP.c index 1d2dd72c..1af4fe5f 100644 --- a/silk/float/find_pred_coefs_FLP.c +++ b/silk/float/find_pred_coefs_FLP.c @@ -91,13 +91,13 @@ void silk_find_pred_coefs_FLP( } silk_memset( psEncCtrl->LTPCoef, 0, psEnc->sCmn.nb_subfr * LTP_ORDER * sizeof( silk_float ) ); psEncCtrl->LTPredCodGain = 0.0f; - psEnc->sCmn.sum_log_gain_Q7 = 0; + psEnc->sCmn.sum_log_gain_Q7 = 0; } /* Limit on total predictive coding gain */ if( psEnc->sCmn.first_frame_after_reset ) { minInvGain = 1.0f / MAX_PREDICTION_POWER_GAIN_AFTER_RESET; - } else { + } else { minInvGain = (silk_float)pow( 2, psEncCtrl->LTPredCodGain / 3 ) / MAX_PREDICTION_POWER_GAIN; minInvGain /= 0.25f + 0.75f * psEncCtrl->coding_quality; } diff --git a/silk/float/pitch_analysis_core_FLP.c b/silk/float/pitch_analysis_core_FLP.c index e58f041b..d0e637a2 100644 --- a/silk/float/pitch_analysis_core_FLP.c +++ b/silk/float/pitch_analysis_core_FLP.c @@ -182,8 +182,8 @@ opus_int silk_pitch_analysis_core_FLP( /* O Voicing estimate: 0 voiced, /* Calculate first vector products before loop */ cross_corr = xcorr[ max_lag_4kHz - min_lag_4kHz ]; - normalizer = silk_energy_FLP( target_ptr, sf_length_8kHz ) + - silk_energy_FLP( basis_ptr, sf_length_8kHz ) + + normalizer = silk_energy_FLP( target_ptr, sf_length_8kHz ) + + silk_energy_FLP( basis_ptr, sf_length_8kHz ) + sf_length_8kHz * 4000.0f; C[ 0 ][ min_lag_4kHz ] += (silk_float)( 2 * cross_corr / normalizer ); |