Improve smoothing behaviour.

diff --git a/src/lib/audio_analysis.cc b/src/lib/audio_analysis.cc
index 0cf08c5bdf1b42078f571b0b6105a99572d7e66c..9d708bbfdd07f30e07327781cc328828a4ecce06 100644 (file)
--- a/src/lib/audio_analysis.cc
+++ b/src/lib/audio_analysis.cc
@@ -123,29 +123,3 @@ AudioAnalysis::write (string filename)
        f.close ();
        boost::filesystem::rename (tmp, filename);
 }
-
-float
-AudioAnalysis::smooth (list<float> const & data, AudioPoint::Type t)
-{
-       float val;
-
-       switch (t) {
-       case AudioPoint::PEAK:
-               /* XXX: fall-off, or something...? */
-               val = -200;
-               for (list<float>::const_iterator i = data.begin(); i != data.end(); ++i) {
-                       val = max (val, *i);
-               }
-               return val;
-       case AudioPoint::RMS:
-               val = 0;
-               for (list<float>::const_iterator i = data.begin(); i != data.end(); ++i) {
-                       val += pow (*i, 2);
-               }
-               return sqrt (val / data.size());
-       default:
-               assert (false);
-       }
-
-       return 0;
-}

diff --git a/src/lib/audio_analysis.h b/src/lib/audio_analysis.h
index a8cfbdeca81a6132afa74004c2a36dc429b2e4db..6e0e2b78a8cf7a5a52f72586259eefb6eb238450 100644 (file)
--- a/src/lib/audio_analysis.h
+++ b/src/lib/audio_analysis.h
@@ -60,8 +60,6 @@ public:
 
        void write (std::string);
 
-       static float smooth (std::list<float> const &, AudioPoint::Type);
-
 private:
        std::vector<std::vector<AudioPoint> > _data;
 };

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index bcec013324a2ad7149aae01a36b58e87753a6dc5..b7736f6647a5df222266c208888467f28b7e38f3 100644 (file)
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -61,7 +61,7 @@ AudioDialog::AudioDialog (wxWindow* parent)
                _type_checkbox[i]->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (AudioDialog::type_clicked), 0, this);
        }
 
-       _smoothing = new wxSlider (this, wxID_ANY, 1, 1, 128);
+       _smoothing = new wxSlider (this, wxID_ANY, AudioPlot::max_smoothing / 2, 1, AudioPlot::max_smoothing);
        _smoothing->Connect (wxID_ANY, wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler (AudioDialog::smoothing_changed), 0, this);
        table->Add (_smoothing, 1, wxEXPAND);
        table->AddSpacer (0);

diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc
index d938d0c278fbe968604fae203959cd6ec5baaf33..23cbabcdc0ee218e337fcb167cf5edf81ce6127b 100644 (file)
--- a/src/wx/audio_plot.cc
+++ b/src/wx/audio_plot.cc
@@ -35,11 +35,12 @@ using boost::bind;
 using boost::shared_ptr;
 
 int const AudioPlot::_minimum = -70;
+int const AudioPlot::max_smoothing = 128;
 
 AudioPlot::AudioPlot (wxWindow* parent)
        : wxPanel (parent)
        , _gain (0)
-       , _smoothing (1)
+       , _smoothing (max_smoothing / 2)
 {
        SetDoubleBuffered (true);
 
@@ -111,100 +112,118 @@ AudioPlot::paint (wxPaintEvent &)
 
        wxGraphicsPath grid = gc->CreatePath ();
        gc->SetFont (gc->CreateFont (*wxSMALL_FONT));
-       wxDouble db_label_width;
        wxDouble db_label_height;
        wxDouble db_label_descent;
        wxDouble db_label_leading;
-       gc->GetTextExtent (_("-80dB"), &db_label_width, &db_label_height, &db_label_descent, &db_label_leading);
+       gc->GetTextExtent (_("-80dB"), &_db_label_width, &db_label_height, &db_label_descent, &db_label_leading);
 
-       db_label_width += 8;
+       _db_label_width += 8;
        
-       int const data_width = GetSize().GetWidth() - db_label_width;
+       int const data_width = GetSize().GetWidth() - _db_label_width;
        /* Assume all channels have the same number of points */
-       float const xs = data_width / float (_analysis->points (0));
-       int const height = GetSize().GetHeight ();
-       int const yo = 32;
-       float const ys = (height - yo) / -_minimum;
+       _x_scale = data_width / float (_analysis->points (0));
+       _height = GetSize().GetHeight ();
+       _y_origin = 32;
+       _y_scale = (_height - _y_origin) / -_minimum;
 
        for (int i = _minimum; i <= 0; i += 10) {
-               int const y = (height - (i - _minimum) * ys) - yo;
-               grid.MoveToPoint (db_label_width - 4, y);
-               grid.AddLineToPoint (db_label_width + data_width, y);
+               int const y = (_height - (i - _minimum) * _y_scale) - _y_origin;
+               grid.MoveToPoint (_db_label_width - 4, y);
+               grid.AddLineToPoint (_db_label_width + data_width, y);
                gc->DrawText (std_to_wx (String::compose ("%1dB", i)), 0, y - (db_label_height / 2));
        }
 
        gc->SetPen (*wxLIGHT_GREY_PEN);
        gc->StrokePath (grid);
 
-       gc->DrawText (_("Time"), data_width, height - yo + db_label_height / 2);
+       gc->DrawText (_("Time"), data_width, _height - _y_origin + db_label_height / 2);
 
-       for (int c = 0; c < MAX_AUDIO_CHANNELS; ++c) {
-               if (!_channel_visible[c] || c >= _analysis->channels()) {
-                       continue;
-               }
-
-               wxGraphicsPath path[AudioPoint::COUNT];
-               
-               for (int i = 0; i < AudioPoint::COUNT; ++i) {
-                       if (!_type_visible[i]) {
-                               continue;
+       
+       if (_type_visible[AudioPoint::PEAK]) {
+               for (int c = 0; c < MAX_AUDIO_CHANNELS; ++c) {
+                       wxGraphicsPath p = gc->CreatePath ();
+                       if (_channel_visible[c] && c < _analysis->channels()) {
+                               plot_peak (p, c);
                        }
-                       
-                       path[i] = gc->CreatePath ();
-
-                       float const val = 20 * log10 (_analysis->get_point(c, 0)[i]);
-                       
-                       path[i].MoveToPoint (
-                               db_label_width,
-                               height - (max (val, float (_minimum)) - _minimum + _gain) * ys - yo
-                               );
+                       wxColour const col = _colours[c];
+                       gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (col.Red(), col.Green(), col.Blue(), col.Alpha() / 2)));
+                       gc->StrokePath (p);
                }
+       }
 
-               list<float> smoothing[AudioPoint::COUNT];
-
-               for (int i = 0; i < _analysis->points(c); ++i) {
-                       for (int j = 0; j < AudioPoint::COUNT; ++j) {
-                               if (!_type_visible[j]) {
-                                       continue;
-                               }
-
-                               smoothing[j].push_back (_analysis->get_point(c, i)[j]);
-                               if (int(smoothing[j].size()) > _smoothing) {
-                                       smoothing[j].pop_front ();
-                               }
-
-                               float const val = 20 * log10 (_analysis->smooth (smoothing[j], static_cast<AudioPoint::Type> (j)));
-                               
-                               path[j].AddLineToPoint (
-                                       i * xs + db_label_width,
-                                       height - (max (val, float (_minimum)) - _minimum + _gain) * ys - yo
-                                       );
+       if (_type_visible[AudioPoint::RMS]) {
+               for (int c = 0; c < MAX_AUDIO_CHANNELS; ++c) {
+                       wxGraphicsPath p = gc->CreatePath ();
+                       if (_channel_visible[c] && c < _analysis->channels()) {
+                               plot_rms (p, c);
                        }
-               }
-
-               wxColour const col = _colours[c];
-
-               if (_type_visible[AudioPoint::RMS]) {
+                       wxColour const col = _colours[c];
                        gc->SetPen (*wxThePenList->FindOrCreatePen (col));
-                       gc->StrokePath (path[AudioPoint::RMS]);
-               }
-
-               if (_type_visible[AudioPoint::PEAK]) {
-                       gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (col.Red(), col.Green(), col.Blue(), col.Alpha() / 2)));
-                       gc->StrokePath (path[AudioPoint::PEAK]);
+                       gc->StrokePath (p);
                }
        }
 
        wxGraphicsPath axes = gc->CreatePath ();
-       axes.MoveToPoint (db_label_width, 0);
-       axes.AddLineToPoint (db_label_width, height - yo);
-       axes.AddLineToPoint (db_label_width + data_width, height - yo);
+       axes.MoveToPoint (_db_label_width, 0);
+       axes.AddLineToPoint (_db_label_width, _height - _y_origin);
+       axes.AddLineToPoint (_db_label_width + data_width, _height - _y_origin);
        gc->SetPen (*wxBLACK_PEN);
        gc->StrokePath (axes);
 
        delete gc;
 }
 
+float
+AudioPlot::y_for_linear (float p) const
+{
+       return _height - (20 * log10(p) - _minimum + _gain) * _y_scale - _y_origin;
+}
+
+void
+AudioPlot::plot_peak (wxGraphicsPath& path, int channel) const
+{
+       path.MoveToPoint (_db_label_width, y_for_linear (_analysis->get_point(channel, 0)[AudioPoint::PEAK]));
+
+       float peak = 0;
+       int const N = _analysis->points(channel);
+       for (int i = 0; i < N; ++i) {
+               float const p = _analysis->get_point(channel, i)[AudioPoint::PEAK];
+               peak -= 0.01f * (1 - log10 (_smoothing) / log10 (max_smoothing));
+               if (p > peak) {
+                       peak = p;
+               } else if (peak < 0) {
+                       peak = 0;
+               }
+               
+               path.AddLineToPoint (_db_label_width + i * _x_scale, y_for_linear (peak));
+       }
+}
+
+void
+AudioPlot::plot_rms (wxGraphicsPath& path, int channel) const
+{
+       path.MoveToPoint (_db_label_width, y_for_linear (_analysis->get_point(channel, 0)[AudioPoint::RMS]));
+
+       list<float> smoothing;
+       int const N = _analysis->points(channel);
+       for (int i = 0; i < N; ++i) {
+
+               smoothing.push_back (_analysis->get_point(channel, i)[AudioPoint::RMS]);
+               if (int(smoothing.size()) > _smoothing) {
+                       smoothing.pop_front ();
+               }
+
+               float p = 0;
+               for (list<float>::const_iterator j = smoothing.begin(); j != smoothing.end(); ++j) {
+                       p += pow (*j, 2);
+               }
+
+               p = sqrt (p / smoothing.size ());
+               
+               path.AddLineToPoint (_db_label_width + i * _x_scale, y_for_linear (p));
+       }
+}
+
 void
 AudioPlot::set_gain (float g)
 {

diff --git a/src/wx/audio_plot.h b/src/wx/audio_plot.h
index fe8862d5431a42aebf77122e9c4983aa4ba40797..7b2955e27e244990a057cbe19f969efad80ab6f0 100644 (file)
--- a/src/wx/audio_plot.h
+++ b/src/wx/audio_plot.h
@@ -34,6 +34,8 @@ public:
        void set_gain (float);
        void set_smoothing (int);
 
+       static const int max_smoothing;
+
 private:
        void paint (wxPaintEvent &);
 
@@ -43,8 +45,17 @@ private:
        /** gain to apply in dB */
        float _gain;
        int _smoothing;
-
        std::vector<wxColour> _colours;
 
+       void plot_peak (wxGraphicsPath &, int) const;
+       void plot_rms (wxGraphicsPath &, int) const;
+       float y_for_linear (float) const;
+
+       double _db_label_width;
+       int _height;
+       int _y_origin;
+       float _x_scale;
+       float _y_scale;
+
        static const int _minimum;
 };