Pretty dumb smoothing.

[dcpomatic.git] / src / wx / audio_plot.cc

diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc
index cccdaed3402611a09f10a8020f9044ab1c3df203..d938d0c278fbe968604fae203959cd6ec5baaf33 100644 (file)
--- a/src/wx/audio_plot.cc
+++ b/src/wx/audio_plot.cc
@@ -28,17 +28,21 @@
 
 using std::cout;
 using std::vector;
+using std::list;
 using std::max;
 using std::min;
 using boost::bind;
 using boost::shared_ptr;
 
-int const AudioPlot::_minimum = -90;
+int const AudioPlot::_minimum = -70;
 
 AudioPlot::AudioPlot (wxWindow* parent)
        : wxPanel (parent)
        , _gain (0)
+       , _smoothing (1)
 {
+       SetDoubleBuffered (true);
+
        for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
                _channel_visible[i] = false;
        }
@@ -99,29 +103,41 @@ AudioPlot::paint (wxPaintEvent &)
                return;
        }
 
-       if (!_analysis) {
+       if (!_analysis || _analysis->channels() == 0) {
                gc->SetFont (gc->CreateFont (*wxNORMAL_FONT));
                gc->DrawText (_("Please wait; audio is being analysed..."), 32, 32);
                return;
        }
+
+       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);
+
+       db_label_width += 8;
        
-       int const width = GetSize().GetWidth();
+       int const data_width = GetSize().GetWidth() - db_label_width;
        /* Assume all channels have the same number of points */
-       float const xs = width / float (_analysis->points (0));
+       float const xs = data_width / float (_analysis->points (0));
        int const height = GetSize().GetHeight ();
-       float const ys = height / -_minimum;
+       int const yo = 32;
+       float const ys = (height - yo) / -_minimum;
 
-       wxGraphicsPath grid = gc->CreatePath ();
-       gc->SetFont (gc->CreateFont (*wxSMALL_FONT));
        for (int i = _minimum; i <= 0; i += 10) {
-               int const y = height - (i - _minimum) * ys;
-               grid.MoveToPoint (0, y);
-               grid.AddLineToPoint (width, y);
-               gc->DrawText (std_to_wx (String::compose ("%1dB", i)), width - 32, y - 12);
+               int const y = (height - (i - _minimum) * ys) - yo;
+               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);
+
        for (int c = 0; c < MAX_AUDIO_CHANNELS; ++c) {
                if (!_channel_visible[c] || c >= _analysis->channels()) {
                        continue;
@@ -135,16 +151,34 @@ AudioPlot::paint (wxPaintEvent &)
                        }
                        
                        path[i] = gc->CreatePath ();
-                       path[i].MoveToPoint (0, height - (max (_analysis->get_point(c, 0)[i], float (_minimum)) - _minimum + _gain) * ys);
+
+                       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
+                               );
                }
 
+               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, height - (max (_analysis->get_point(c, i)[j], float (_minimum)) - _minimum + _gain) * ys);
+                               path[j].AddLineToPoint (
+                                       i * xs + db_label_width,
+                                       height - (max (val, float (_minimum)) - _minimum + _gain) * ys - yo
+                                       );
                        }
                }
 
@@ -161,6 +195,13 @@ AudioPlot::paint (wxPaintEvent &)
                }
        }
 
+       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);
+       gc->SetPen (*wxBLACK_PEN);
+       gc->StrokePath (axes);
+
        delete gc;
 }
 
@@ -170,3 +211,10 @@ AudioPlot::set_gain (float g)
        _gain = g;
        Refresh ();
 }
+
+void
+AudioPlot::set_smoothing (int s)
+{
+       _smoothing = s;
+       Refresh ();
+}