X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_plot.cc;h=605738b4fdabfdad2fd16ee26c9b14e75c2669c1;hb=4bf5a8794cf1ed6411e085b35c11777c3508f82e;hp=cccdaed3402611a09f10a8020f9044ab1c3df203;hpb=6e0f2a39c9deeb51f05c0c8c9bd46632c2c6483a;p=dcpomatic.git diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc index cccdaed34..605738b4f 100644 --- a/src/wx/audio_plot.cc +++ b/src/wx/audio_plot.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,29 +17,35 @@ */ -#include -#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" +#include +#include +#include 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; +int const AudioPlot::max_smoothing = 128; AudioPlot::AudioPlot (wxWindow* parent) - : wxPanel (parent) - , _gain (0) + : wxPanel (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE) + , _smoothing (max_smoothing / 2) + , _gain_correction (0) { - for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) { +#ifndef __WXOSX__ + SetDoubleBuffered (true); +#endif + + for (int i = 0; i < MAX_DCP_AUDIO_CHANNELS; ++i) { _channel_visible[i] = false; } @@ -47,15 +53,27 @@ 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)); - - Connect (wxID_ANY, wxEVT_PAINT, wxPaintEventHandler (AudioPlot::paint), 0, this); - + _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 + + Bind (wxEVT_PAINT, boost::bind (&AudioPlot::paint, this)); + SetMinSize (wxSize (640, 512)); } @@ -64,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 (); } @@ -90,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); @@ -99,74 +129,186 @@ 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); + gc->DrawText (_message, 32, 32); return; } - - int const width = GetSize().GetWidth(); - /* Assume all channels have the same number of points */ - float const xs = width / float (_analysis->points (0)); - int const height = GetSize().GetHeight (); - float const ys = height / -_minimum; wxGraphicsPath grid = gc->CreatePath (); gc->SetFont (gc->CreateFont (*wxSMALL_FONT)); + wxDouble db_label_height; + wxDouble db_label_descent; + wxDouble db_label_leading; + Metrics metrics; + gc->GetTextExtent (wxT ("-80dB"), &metrics.db_label_width, &db_label_height, &db_label_descent, &db_label_leading); + + metrics.db_label_width += 8; + + int const data_width = GetSize().GetWidth() - metrics.db_label_width; + /* Assume all channels have the same number of points */ + 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) * 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 = (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); - for (int c = 0; c < MAX_AUDIO_CHANNELS; ++c) { - if (!_channel_visible[c] || c >= _analysis->channels()) { - continue; - } + gc->DrawText (_("Time"), data_width, metrics.height - metrics.y_origin + db_label_height / 2); - 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_DCP_AUDIO_CHANNELS; ++c) { + wxGraphicsPath p = gc->CreatePath (); + if (_channel_visible[c] && c < _analysis->channels()) { + plot_peak (p, c, metrics); } - - path[i] = gc->CreatePath (); - path[i].MoveToPoint (0, height - (max (_analysis->get_point(c, 0)[i], float (_minimum)) - _minimum + _gain) * ys); + wxColour const col = _colours[c]; + gc->SetPen (wxPen (wxColour (col.Red(), col.Green(), col.Blue(), col.Alpha() / 2), 1, wxPENSTYLE_SOLID)); + gc->StrokePath (p); } + } - for (int i = 0; i < _analysis->points(c); ++i) { - for (int j = 0; j < AudioPoint::COUNT; ++j) { - if (!_type_visible[j]) { - continue; - } - - path[j].AddLineToPoint (i * xs, height - (max (_analysis->get_point(c, i)[j], float (_minimum)) - _minimum + _gain) * ys); + if (_type_visible[AudioPoint::RMS]) { + 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, metrics); } + wxColour const col = _colours[c]; + gc->SetPen (wxPen (col, 1, wxPENSTYLE_SOLID)); + gc->StrokePath (p); } + } - wxColour const col = _colours[c]; + wxGraphicsPath axes = gc->CreatePath (); + 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); - if (_type_visible[AudioPoint::RMS]) { - gc->SetPen (*wxThePenList->FindOrCreatePen (col)); - gc->StrokePath (path[AudioPoint::RMS]); + delete gc; +} + +float +AudioPlot::y_for_linear (float p, Metrics const & metrics) const +{ + if (p < 1e-4) { + p = 1e-4; + } + + return metrics.height - (20 * log10(p) - _minimum) * metrics.y_scale - metrics.y_origin; +} + +void +AudioPlot::plot_peak (wxGraphicsPath& path, int channel, Metrics const & metrics) const +{ + if (_analysis->points (channel) == 0) { + return; + } + + path.MoveToPoint (metrics.db_label_width, y_for_linear (get_point(channel, 0)[AudioPoint::PEAK], metrics)); + + float peak = 0; + int const N = _analysis->points(channel); + for (int i = 0; i < N; ++i) { + float const p = 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; } - if (_type_visible[AudioPoint::PEAK]) { - gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (col.Red(), col.Green(), col.Blue(), col.Alpha() / 2))); - gc->StrokePath (path[AudioPoint::PEAK]); + path.AddLineToPoint (metrics.db_label_width + i * metrics.x_scale, y_for_linear (peak, metrics)); + } +} + +void +AudioPlot::plot_rms (wxGraphicsPath& path, int channel, Metrics const & metrics) const +{ + if (_analysis->points (channel) == 0) { + return; + } + + path.MoveToPoint (metrics.db_label_width, y_for_linear (get_point(channel, 0)[AudioPoint::RMS], metrics)); + + list smoothing; + + int const N = _analysis->points(channel); + + float const first = get_point(channel, 0)[AudioPoint::RMS]; + float const last = 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 (get_point(channel, i)[AudioPoint::RMS]); + } else { + smoothing.push_back (last); } } - delete gc; + for (int i = 0; i < N; ++i) { + + int const next_for_window = i + after; + + if (next_for_window < N) { + smoothing.push_back (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); + } + + if (!smoothing.empty ()) { + p = sqrt (p / smoothing.size ()); + } + + path.AddLineToPoint (metrics.db_label_width + i * metrics.x_scale, y_for_linear (p, metrics)); + } +} + +void +AudioPlot::set_smoothing (int s) +{ + _smoothing = s; + Refresh (); } void -AudioPlot::set_gain (float g) +AudioPlot::set_gain_correction (double gain) { - _gain = g; + _gain_correction = gain; Refresh (); } + +AudioPoint +AudioPlot::get_point (int channel, int point) const +{ + AudioPoint p = _analysis->get_point (channel, point); + for (int i = 0; i < AudioPoint::COUNT; ++i) { + p[i] *= pow (10, _gain_correction / 20); + } + + return p; +}