diff options
| author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2016-11-07 21:31:40 +0300 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2016-11-23 21:30:22 +0300 |
| commit | b355259bdfd3070def691ad33b9725f696a597f2 (patch) | |
| tree | d8c78796adcd327b674e92b09bc0968b4bde01a5 | |
| parent | f4dc31a6242dae2ce907849d5fdd3ba033da952b (diff) | |
fix tonality reporting
| -rw-r--r-- | src/analysis.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/analysis.c b/src/analysis.c index 9faffb52..7e578801 100644 --- a/src/analysis.c +++ b/src/analysis.c @@ -300,7 +300,7 @@ static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt mod2 *= mod2; mod2 *= mod2; - avg_mod = .25f*(d2A[i]+2.f*mod1+mod2); + avg_mod = .25f*(.25*d2A[i]+.5f*mod1+3.25*mod2); tonality[i] = 1.f/(1.f+40.f*16.f*pi4*avg_mod)-.015f; A[i] = angle2; @@ -378,7 +378,7 @@ static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt frame_stationarity += stationarity; /*band_tonality[b] = tE/(1e-15+E)*/; band_tonality[b] = MAX16(tE/(1e-15f+E), stationarity*tonal->prev_band_tonality[b]); - printf("%f ", band_tonality[b]); + //printf("%f ", band_tonality[b]); #if 0 if (b>=NB_TONAL_SKIP_BANDS) { @@ -395,7 +395,7 @@ static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt /*printf("%f %f ", band_tonality[b], stationarity);*/ tonal->prev_band_tonality[b] = band_tonality[b]; } - printf("\n"); + //printf("\n"); bandwidth_mask = 0; bandwidth = 0; maxE = 0; @@ -659,5 +659,5 @@ void run_analysis(TonalityAnalysisState *analysis, const CELTMode *celt_mode, co } analysis_info->valid = 0; - tonality_get_info(analysis, analysis_info, frame_size); + tonality_get_info(analysis, analysis_info, frame_size/2); } |