diff options
author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2016-06-29 23:11:57 -0400 |
---|---|---|
committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2016-06-29 23:11:57 -0400 |
commit | 9b1a27a3bce47ccccb24f7caf8918e898044470a (patch) | |
tree | cb5bf09381f9a707083aea2dac88891697a4d5e6 /src/analysis.c | |
parent | 1ac3a5630af4e5fb01d5b8d896c377a5e736cc4c (diff) | |
download | libopus-9b1a27a3bce47ccccb24f7caf8918e898044470a.tar.gz |
Address static analysis reports from scan-build
Diffstat (limited to 'src/analysis.c')
-rw-r--r-- | src/analysis.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/analysis.c b/src/analysis.c index 360ebcc8..663431a4 100644 --- a/src/analysis.c +++ b/src/analysis.c @@ -540,17 +540,14 @@ static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt /* Instantaneous probability of speech and music, with beta pre-applied. */ float speech0; float music0; + float p, q; /* One transition every 3 minutes of active audio */ tau = .00005f*frame_probs[1]; - beta = .05f; - if (1) { - /* Adapt beta based on how "unexpected" the new prob is */ - float p, q; - p = MAX16(.05f,MIN16(.95f,frame_probs[0])); - q = MAX16(.05f,MIN16(.95f,tonal->music_prob)); - beta = .01f+.05f*ABS16(p-q)/(p*(1-q)+q*(1-p)); - } + /* Adapt beta based on how "unexpected" the new prob is */ + p = MAX16(.05f,MIN16(.95f,frame_probs[0])); + q = MAX16(.05f,MIN16(.95f,tonal->music_prob)); + beta = .01f+.05f*ABS16(p-q)/(p*(1-q)+q*(1-p)); /* p0 and p1 are the probabilities of speech and music at this frame using only information from previous frame and applying the state transition model */ |