diff options
| author | Gregory Maxwell <greg@xiph.org> | 2013-07-15 15:51:24 -0700 |
|---|---|---|
| committer | Gregory Maxwell <greg@xiph.org> | 2013-07-15 15:51:24 -0700 |
| commit | 5280c71883e4a2d072d6f69ab7c9b6dc7ace66dc (patch) | |
| tree | 71052cb37fb1bcc0d9778131f21b836e0acbcb55 /src/analysis.c | |
| parent | 4effd308828dd6bbbd1ad210c63d6518161b640d (diff) | |
| download | libopus-5280c71883e4a2d072d6f69ab7c9b6dc7ace66dc.tar.gz | |
Revert "Fixes a number of double promotions and missing casts."
This reverts commit 43279728cd39947f95dbf77557a0a698f164fdd1.
Diffstat (limited to 'src/analysis.c')
| -rw-r--r-- | src/analysis.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/analysis.c b/src/analysis.c index 26dab9c2..a9d2073f 100644 --- a/src/analysis.c +++ b/src/analysis.c @@ -283,12 +283,12 @@ void tonality_analysis(TonalityAnalysisState *tonal, AnalysisInfo *info_out, con d_angle2 = angle2 - angle; d2_angle2 = d_angle2 - d_angle; - mod1 = d2_angle - (float)floor(.5f+d2_angle); + mod1 = d2_angle - (float)floor(.5+d2_angle); noisiness[i] = ABS16(mod1); mod1 *= mod1; mod1 *= mod1; - mod2 = d2_angle2 - (float)floor(.5f+d2_angle2); + mod2 = d2_angle2 - (float)floor(.5+d2_angle2); noisiness[i] += ABS16(mod2); mod2 *= mod2; mod2 *= mod2; @@ -404,7 +404,7 @@ void tonality_analysis(TonalityAnalysisState *tonal, AnalysisInfo *info_out, con both the ATH and the loudness-dependent slope of the spreading function) 3) above the PCM quantization noise floor */ - if (E>.1f*bandwidth_mask && E*1e9f > maxE && E > noise_floor*(band_end-band_start)) + if (E>.1*bandwidth_mask && E*1e9f > maxE && E > noise_floor*(band_end-band_start)) bandwidth = b; } if (tonal->count<=2) @@ -568,16 +568,16 @@ void tonality_analysis(TonalityAnalysisState *tonal, AnalysisInfo *info_out, con psum += tonal->pspeech[i]; /* Estimate our confidence in the speech/music decisions */ - if (frame_probs[1]>.75f) + if (frame_probs[1]>.75) { - if (tonal->music_prob>.9f) + if (tonal->music_prob>.9) { float adapt; adapt = 1.f/(++tonal->music_confidence_count); tonal->music_confidence_count = IMIN(tonal->music_confidence_count, 500); tonal->music_confidence += adapt*MAX16(-.2f,frame_probs[0]-tonal->music_confidence); } - if (tonal->music_prob<.1f) + if (tonal->music_prob<.1) { float adapt; adapt = 1.f/(++tonal->speech_confidence_count); |