re-bin analysis results to take silence striping into account.

diff --git a/libs/audiographer/src/general/analyser.cc b/libs/audiographer/src/general/analyser.cc
index ec47b13b32343496d35e95ea1e43b2580476166e..b6a3e1bbde14dadf6db11418bc46e41434daaaac 100644 (file)
--- a/libs/audiographer/src/general/analyser.cc
+++ b/libs/audiographer/src/general/analyser.cc
@@ -242,11 +242,33 @@ ARDOUR::ExportAnalysisPtr
 Analyser::result ()
 {
        DEBUG_TRACE (PBD::DEBUG::ExportAnalysis, string_compose ("Processed %1 / %2 samples\n", _pos, _n_samples));
-       if (_pos == 0 || ::llabs (_pos -_n_samples) > 1) {
-               printf("NO ANAL\n");
+       if (_pos == 0 || _pos > _n_samples + 1) {
                return ARDOUR::ExportAnalysisPtr ();
        }
 
+       if (_pos + 1 < _n_samples) {
+               // crude re-bin (silence stripped version)
+               const size_t peaks = sizeof (_result.peaks) / sizeof (ARDOUR::PeakData::PeakDatum) / 4;
+               for (framecnt_t b = peaks - 1; b > 0; --b) {
+                       for (unsigned int c = 0; c < _result.n_channels; ++c) {
+                               const framecnt_t sb = b * _pos / _n_samples;
+                               _result.peaks[c][b].min = _result.peaks[c][sb].min;
+                               _result.peaks[c][b].max = _result.peaks[c][sb].max;
+                       }
+               }
+
+               const size_t swh = sizeof (_result.spectrum) / sizeof (float);
+               const size_t height = sizeof (_result.spectrum[0]) / sizeof (float);
+               const size_t width = swh / height;
+               for (framecnt_t b = width - 1; b > 0; --b) {
+                       // TODO round down to prev _fft_data_size bin
+                       const framecnt_t sb = b * _pos / _n_samples;
+                       for (unsigned int y = 0; y < height; ++y) {
+                               _result.spectrum[b][y] = _result.spectrum[sb][y];
+                       }
+               }
+       }
+
        if (_ebur128_plugin) {
                Vamp::Plugin::FeatureSet features = _ebur128_plugin->getRemainingFeatures ();
                if (!features.empty () && features.size () == 3) {