X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_plot.cc;h=16930ffd870ab55724d6753ea0e91eabcb8160ca;hb=a112eeb4d052b1212f94e95efd83a215213da691;hp=2098adb40d04e2a7f7801b35d1de99d676f60400;hpb=a2eed42dec7cb76ad787eccaad6ffa800d945e24;p=dcpomatic.git diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc index 2098adb40..16930ffd8 100644 --- a/src/wx/audio_plot.cc +++ b/src/wx/audio_plot.cc @@ -21,7 +21,6 @@ #include #include #include "audio_plot.h" -#include "lib/decoder_factory.h" #include "lib/audio_decoder.h" #include "lib/audio_analysis.h" #include "wx/wx_util.h" @@ -38,13 +37,15 @@ int const AudioPlot::_minimum = -70; int const AudioPlot::max_smoothing = 128; AudioPlot::AudioPlot (wxWindow* parent) - : wxPanel (parent) + : wxPanel (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE) , _gain (0) , _smoothing (max_smoothing / 2) { +#ifndef __WXOSX__ SetDoubleBuffered (true); +#endif - for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) { + for (int i = 0; i < MAX_DCP_AUDIO_CHANNELS; ++i) { _channel_visible[i] = false; } @@ -52,14 +53,26 @@ AudioPlot::AudioPlot (wxWindow* parent) _type_visible[i] = false; } - _colours.push_back (wxColour ( 0, 0, 0)); - _colours.push_back (wxColour (255, 0, 0)); - _colours.push_back (wxColour ( 0, 255, 0)); + _colours.push_back (wxColour ( 0, 0, 0)); + _colours.push_back (wxColour (255, 0, 0)); + _colours.push_back (wxColour ( 0, 255, 0)); _colours.push_back (wxColour (139, 0, 204)); - _colours.push_back (wxColour ( 0, 0, 255)); - _colours.push_back (wxColour (100, 100, 100)); + _colours.push_back (wxColour ( 0, 0, 255)); + _colours.push_back (wxColour ( 0, 139, 0)); + _colours.push_back (wxColour ( 0, 0, 139)); + _colours.push_back (wxColour (255, 255, 0)); + _colours.push_back (wxColour ( 0, 255, 255)); + _colours.push_back (wxColour (255, 0, 255)); + _colours.push_back (wxColour (255, 0, 139)); + _colours.push_back (wxColour (139, 0, 255)); + + set_analysis (shared_ptr ()); + +#if MAX_DCP_AUDIO_CHANNELS != 12 +#warning AudioPlot::AudioPlot is expecting the wrong MAX_DCP_AUDIO_CHANNELS +#endif - Connect (wxID_ANY, wxEVT_PAINT, wxPaintEventHandler (AudioPlot::paint), 0, this); + Bind (wxEVT_PAINT, boost::bind (&AudioPlot::paint, this)); SetMinSize (wxSize (640, 512)); } @@ -69,14 +82,10 @@ AudioPlot::set_analysis (shared_ptr a) { _analysis = a; - for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) { - _channel_visible[i] = false; + if (!a) { + _message = _("Please wait; audio is being analysed..."); } - for (int i = 0; i < AudioPoint::COUNT; ++i) { - _type_visible[i] = false; - } - Refresh (); } @@ -95,7 +104,23 @@ AudioPlot::set_type_visible (int t, bool v) } void -AudioPlot::paint (wxPaintEvent &) +AudioPlot::set_message (wxString s) +{ + _message = s; + Refresh (); +} + +struct Metrics +{ + double db_label_width; + int height; + int y_origin; + float x_scale; + float y_scale; +}; + +void +AudioPlot::paint () { wxPaintDC dc (this); @@ -106,7 +131,7 @@ AudioPlot::paint (wxPaintEvent &) if (!_analysis || _analysis->channels() == 0) { gc->SetFont (gc->CreateFont (*wxNORMAL_FONT)); - gc->DrawText (_("Please wait; audio is being analysed..."), 32, 32); + gc->DrawText (_message, 32, 32); return; } @@ -115,82 +140,82 @@ AudioPlot::paint (wxPaintEvent &) 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); + Metrics metrics; + gc->GetTextExtent (wxT ("-80dB"), &metrics.db_label_width, &db_label_height, &db_label_descent, &db_label_leading); - _db_label_width += 8; + metrics.db_label_width += 8; - int const data_width = GetSize().GetWidth() - _db_label_width; + int const data_width = GetSize().GetWidth() - metrics.db_label_width; /* Assume all channels have the same number of points */ - _x_scale = data_width / float (_analysis->points (0)); - _height = GetSize().GetHeight (); - _y_origin = 32; - _y_scale = (_height - _y_origin) / -_minimum; + metrics.x_scale = data_width / float (_analysis->points (0)); + metrics.height = GetSize().GetHeight (); + metrics.y_origin = 32; + metrics.y_scale = (metrics.height - metrics.y_origin) / -_minimum; for (int i = _minimum; i <= 0; i += 10) { - 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); + int const y = (metrics.height - (i - _minimum) * metrics.y_scale) - metrics.y_origin; + grid.MoveToPoint (metrics.db_label_width - 4, y); + grid.AddLineToPoint (metrics.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->SetPen (wxPen (wxColour (200, 200, 200))); gc->StrokePath (grid); - gc->DrawText (_("Time"), data_width, _height - _y_origin + db_label_height / 2); - + gc->DrawText (_("Time"), data_width, metrics.height - metrics.y_origin + db_label_height / 2); if (_type_visible[AudioPoint::PEAK]) { - for (int c = 0; c < MAX_AUDIO_CHANNELS; ++c) { + for (int c = 0; c < MAX_DCP_AUDIO_CHANNELS; ++c) { wxGraphicsPath p = gc->CreatePath (); if (_channel_visible[c] && c < _analysis->channels()) { - plot_peak (p, c); + plot_peak (p, c, metrics); } wxColour const col = _colours[c]; -#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 9 - gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (col.Red(), col.Green(), col.Blue(), col.Alpha() / 2), 1, wxPENSTYLE_SOLID)); -#else - gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (col.Red(), col.Green(), col.Blue(), col.Alpha() / 2), 1, wxSOLID)); -#endif + gc->SetPen (wxPen (wxColour (col.Red(), col.Green(), col.Blue(), col.Alpha() / 2), 1, wxPENSTYLE_SOLID)); gc->StrokePath (p); } } if (_type_visible[AudioPoint::RMS]) { - for (int c = 0; c < MAX_AUDIO_CHANNELS; ++c) { + for (int c = 0; c < MAX_DCP_AUDIO_CHANNELS; ++c) { wxGraphicsPath p = gc->CreatePath (); if (_channel_visible[c] && c < _analysis->channels()) { - plot_rms (p, c); + plot_rms (p, c, metrics); } wxColour const col = _colours[c]; -#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 9 - gc->SetPen (*wxThePenList->FindOrCreatePen (col, 1, wxPENSTYLE_SOLID)); -#else - gc->SetPen (*wxThePenList->FindOrCreatePen (col, 1, wxSOLID)); -#endif + gc->SetPen (wxPen (col, 1, wxPENSTYLE_SOLID)); gc->StrokePath (p); } } wxGraphicsPath axes = gc->CreatePath (); - 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); + axes.MoveToPoint (metrics.db_label_width, 0); + axes.AddLineToPoint (metrics.db_label_width, metrics.height - metrics.y_origin); + axes.AddLineToPoint (metrics.db_label_width + data_width, metrics.height - metrics.y_origin); + gc->SetPen (wxPen (wxColour (0, 0, 0))); gc->StrokePath (axes); delete gc; } float -AudioPlot::y_for_linear (float p) const +AudioPlot::y_for_linear (float p, Metrics const & metrics) const { - return _height - (20 * log10(p) - _minimum + _gain) * _y_scale - _y_origin; + if (p < 1e-4) { + p = 1e-4; + } + + return metrics.height - (20 * log10(p) - _minimum + _gain) * metrics.y_scale - metrics.y_origin; } void -AudioPlot::plot_peak (wxGraphicsPath& path, int channel) const +AudioPlot::plot_peak (wxGraphicsPath& path, int channel, Metrics const & metrics) const { - path.MoveToPoint (_db_label_width, y_for_linear (_analysis->get_point(channel, 0)[AudioPoint::PEAK])); + if (_analysis->points (channel) == 0) { + return; + } + + path.MoveToPoint (metrics.db_label_width, y_for_linear (_analysis->get_point(channel, 0)[AudioPoint::PEAK], metrics)); float peak = 0; int const N = _analysis->points(channel); @@ -202,34 +227,64 @@ AudioPlot::plot_peak (wxGraphicsPath& path, int channel) const } else if (peak < 0) { peak = 0; } - - path.AddLineToPoint (_db_label_width + i * _x_scale, y_for_linear (peak)); + + path.AddLineToPoint (metrics.db_label_width + i * metrics.x_scale, y_for_linear (peak, metrics)); } } void -AudioPlot::plot_rms (wxGraphicsPath& path, int channel) const +AudioPlot::plot_rms (wxGraphicsPath& path, int channel, Metrics const & metrics) const { - path.MoveToPoint (_db_label_width, y_for_linear (_analysis->get_point(channel, 0)[AudioPoint::RMS])); + if (_analysis->points (channel) == 0) { + return; + } + + path.MoveToPoint (metrics.db_label_width, y_for_linear (_analysis->get_point(channel, 0)[AudioPoint::RMS], metrics)); list smoothing; + int const N = _analysis->points(channel); + + float const first = _analysis->get_point(channel, 0)[AudioPoint::RMS]; + float const last = _analysis->get_point(channel, N - 1)[AudioPoint::RMS]; + + int const before = _smoothing / 2; + int const after = _smoothing - before; + + /* Pre-load the smoothing list */ + for (int i = 0; i < before; ++i) { + smoothing.push_back (first); + } + for (int i = 0; i < after; ++i) { + if (i < N) { + smoothing.push_back (_analysis->get_point(channel, i)[AudioPoint::RMS]); + } else { + smoothing.push_back (last); + } + } + 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 (); + int const next_for_window = i + after; + + if (next_for_window < N) { + smoothing.push_back (_analysis->get_point(channel, i)[AudioPoint::RMS]); + } else { + smoothing.push_back (last); } + smoothing.pop_front (); + float p = 0; for (list::const_iterator j = smoothing.begin(); j != smoothing.end(); ++j) { p += pow (*j, 2); } - p = sqrt (p / smoothing.size ()); + if (!smoothing.empty ()) { + p = sqrt (p / smoothing.size ()); + } - int const ind = max (0, i - int(smoothing.size() / 2)); - path.AddLineToPoint (_db_label_width + ind * _x_scale, y_for_linear (p)); + path.AddLineToPoint (metrics.db_label_width + i * metrics.x_scale, y_for_linear (p, metrics)); } }