diff options
| author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2017-06-19 17:55:56 -0400 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2017-06-19 17:55:56 -0400 |
| commit | 5bb3cbc34c532a92916612e2540f48470d03389c (patch) | |
| tree | a59bb957cc4f63126de0dc8d71e64ced5b3b3442 | |
| parent | 352786c9cb247a8fba2370cc27478c2a0108f9c4 (diff) | |
| download | opus-5bb3cbc34c532a92916612e2540f48470d03389c.tar.gz | |
Add "f" suffix to float constantsv1.2
| -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 4ad44d35..6078dbea 100644 --- a/src/analysis.c +++ b/src/analysis.c @@ -269,7 +269,7 @@ void tonality_get_info(TonalityAnalysisState *tonal, AnalysisInfo *info_out, int tonality_avg += tonal->info[pos].tonality; tonality_count++; } - info_out->tonality = MAX32(tonality_avg/tonality_count, tonality_max-.2); + info_out->tonality = MAX32(tonality_avg/tonality_count, tonality_max-.2f); tonal->read_subframe += len/(tonal->Fs/400); while (tonal->read_subframe>=8) { @@ -370,9 +370,9 @@ static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt if (tonal->count<4) { if (tonal->application == OPUS_APPLICATION_VOIP) - tonal->music_prob = .1; + tonal->music_prob = .1f; else - tonal->music_prob = .625; + tonal->music_prob = .625f; } kfft = celt_mode->mdct.kfft[0]; if (tonal->count==0) @@ -703,7 +703,7 @@ static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt frame_stationarity /= NB_TBANDS; relativeE /= NB_TBANDS; if (tonal->count<10) - relativeE = .5; + relativeE = .5f; frame_noisiness /= NB_TBANDS; #if 1 info->activity = frame_noisiness + (1-frame_noisiness)*relativeE; @@ -833,9 +833,9 @@ static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt if (tonal->count==1) { if (tonal->application == OPUS_APPLICATION_VOIP) - tonal->pmusic[0] = .1; + tonal->pmusic[0] = .1f; else - tonal->pmusic[0] = .625; + tonal->pmusic[0] = .625f; tonal->pspeech[0] = 1-tonal->pmusic[0]; } /* Updated probability of having only speech (s0) or only music (m0), |