X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Faudio_plot.cc;h=8dab84be8bf21ff5453fe3e9c6f12212ca1b70cb;hb=740977ac39b3b1ae64bd06efce0a3bf9d188dd67;hp=69faf127e2db0404fa5192cf9f12d8a74510ec5b;hpb=9579bfdec2fab28fc221e397cf848a08e48f6840;p=dcpomatic.git diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc index 69faf127e..8dab84be8 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,13 +17,14 @@ */ -#include -#include -#include #include "audio_plot.h" #include "lib/audio_decoder.h" #include "lib/audio_analysis.h" +#include "lib/compose.hpp" #include "wx/wx_util.h" +#include +#include +#include using std::cout; using std::vector; @@ -38,13 +39,12 @@ int const AudioPlot::max_smoothing = 128; AudioPlot::AudioPlot (wxWindow* parent) : wxPanel (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE) - , _gain (0) , _smoothing (max_smoothing / 2) - , _message (_("Please wait; audio is being analysed...")) + , _gain_correction (0) { -#ifndef __WXOSX__ +#ifndef __WXOSX__ SetDoubleBuffered (true); -#endif +#endif for (int i = 0; i < MAX_DCP_AUDIO_CHANNELS; ++i) { _channel_visible[i] = false; @@ -67,12 +67,19 @@ AudioPlot::AudioPlot (wxWindow* parent) _colours.push_back (wxColour (255, 0, 139)); _colours.push_back (wxColour (139, 0, 255)); -#if MAX_DCP_AUDIO_CHANNELS != 12 + _colours.push_back (wxColour (139, 139, 255)); + _colours.push_back (wxColour ( 0, 139, 255)); + _colours.push_back (wxColour (255, 139, 139)); + _colours.push_back (wxColour (255, 139, 0)); + + set_analysis (shared_ptr ()); + +#if MAX_DCP_AUDIO_CHANNELS != 16 #warning AudioPlot::AudioPlot is expecting the wrong MAX_DCP_AUDIO_CHANNELS -#endif - +#endif + Bind (wxEVT_PAINT, boost::bind (&AudioPlot::paint, this)); - + SetMinSize (wxSize (640, 512)); } @@ -81,14 +88,10 @@ AudioPlot::set_analysis (shared_ptr a) { _analysis = a; - for (int i = 0; i < MAX_DCP_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 (); } @@ -147,7 +150,7 @@ AudioPlot::paint () 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)); @@ -162,11 +165,11 @@ AudioPlot::paint () 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, metrics.height - metrics.y_origin + db_label_height / 2); - + if (_type_visible[AudioPoint::PEAK]) { for (int c = 0; c < MAX_DCP_AUDIO_CHANNELS; ++c) { wxGraphicsPath p = gc->CreatePath (); @@ -174,7 +177,7 @@ AudioPlot::paint () plot_peak (p, c, metrics); } wxColour const col = _colours[c]; - gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (col.Red(), col.Green(), col.Blue(), col.Alpha() / 2), 1, wxPENSTYLE_SOLID)); + gc->SetPen (wxPen (wxColour (col.Red(), col.Green(), col.Blue(), col.Alpha() / 2), 1, wxPENSTYLE_SOLID)); gc->StrokePath (p); } } @@ -186,7 +189,7 @@ AudioPlot::paint () plot_rms (p, c, metrics); } wxColour const col = _colours[c]; - gc->SetPen (*wxThePenList->FindOrCreatePen (col, 1, wxPENSTYLE_SOLID)); + gc->SetPen (wxPen (col, 1, wxPENSTYLE_SOLID)); gc->StrokePath (p); } } @@ -195,7 +198,7 @@ AudioPlot::paint () 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 (*wxBLACK_PEN); + gc->SetPen (wxPen (wxColour (0, 0, 0))); gc->StrokePath (axes); delete gc; @@ -207,8 +210,8 @@ AudioPlot::y_for_linear (float p, Metrics const & metrics) const if (p < 1e-4) { p = 1e-4; } - - return metrics.height - (20 * log10(p) - _minimum + _gain) * metrics.y_scale - metrics.y_origin; + + return metrics.height - (20 * log10(p) - _minimum) * metrics.y_scale - metrics.y_origin; } void @@ -217,13 +220,13 @@ AudioPlot::plot_peak (wxGraphicsPath& path, int channel, Metrics const & metrics if (_analysis->points (channel) == 0) { return; } - - path.MoveToPoint (metrics.db_label_width, y_for_linear (_analysis->get_point(channel, 0)[AudioPoint::PEAK], metrics)); + + 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 = _analysis->get_point(channel, i)[AudioPoint::PEAK]; + float const p = get_point(channel, i)[AudioPoint::PEAK]; peak -= 0.01f * (1 - log10 (_smoothing) / log10 (max_smoothing)); if (p > peak) { peak = p; @@ -241,26 +244,26 @@ AudioPlot::plot_rms (wxGraphicsPath& path, int channel, Metrics const & metrics) if (_analysis->points (channel) == 0) { return; } - - path.MoveToPoint (metrics.db_label_width, y_for_linear (_analysis->get_point(channel, 0)[AudioPoint::RMS], metrics)); + + 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 = _analysis->get_point(channel, 0)[AudioPoint::RMS]; - float const last = _analysis->get_point(channel, N - 1)[AudioPoint::RMS]; + 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 (_analysis->get_point(channel, i)[AudioPoint::RMS]); + smoothing.push_back (get_point(channel, i)[AudioPoint::RMS]); } else { smoothing.push_back (last); } @@ -271,7 +274,7 @@ AudioPlot::plot_rms (wxGraphicsPath& path, int channel, Metrics const & metrics) int const next_for_window = i + after; if (next_for_window < N) { - smoothing.push_back (_analysis->get_point(channel, i)[AudioPoint::RMS]); + smoothing.push_back (get_point(channel, i)[AudioPoint::RMS]); } else { smoothing.push_back (last); } @@ -283,7 +286,7 @@ AudioPlot::plot_rms (wxGraphicsPath& path, int channel, Metrics const & metrics) p += pow (*j, 2); } - if (smoothing.size() > 0) { + if (!smoothing.empty ()) { p = sqrt (p / smoothing.size ()); } @@ -292,15 +295,26 @@ AudioPlot::plot_rms (wxGraphicsPath& path, int channel, Metrics const & metrics) } void -AudioPlot::set_gain (float g) +AudioPlot::set_smoothing (int s) { - _gain = g; + _smoothing = s; Refresh (); } void -AudioPlot::set_smoothing (int s) +AudioPlot::set_gain_correction (double gain) { - _smoothing = s; + _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; +}