#include "lib/analyse_audio_job.h"
#include "lib/audio_content.h"
#include "lib/job_manager.h"
+#include <libxml++/libxml++.h>
#include <boost/filesystem.hpp>
+#include <iostream>
using std::cout;
using boost::shared_ptr;
AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<AudioContent> content)
: wxDialog (parent, wxID_ANY, _("Audio"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE)
, _film (film)
+ , _channels (film->audio_channels ())
, _plot (0)
{
wxFont subheading_font (*wxNORMAL_FONT);
wxBoxSizer* left = new wxBoxSizer (wxVERTICAL);
_plot = new AudioPlot (this);
- left->Add (_plot, 1, wxALL | wxEXPAND, 12);
- _peak_time = new wxStaticText (this, wxID_ANY, wxT (""));
- left->Add (_peak_time, 0, wxALL, 12);
+ left->Add (_plot, 1, wxTOP | wxEXPAND, 12);
+ _sample_peak = new wxStaticText (this, wxID_ANY, wxT (""));
+ left->Add (_sample_peak, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP);
+ _true_peak = new wxStaticText (this, wxID_ANY, wxT (""));
+ left->Add (_true_peak, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP);
+ _integrated_loudness = new wxStaticText (this, wxID_ANY, wxT (""));
+ left->Add (_integrated_loudness, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP);
+ _loudness_range = new wxStaticText (this, wxID_ANY, wxT (""));
+ left->Add (_loudness_range, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP);
lr_sizer->Add (left, 1, wxALL, 12);
right->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM, 16);
}
- for (int i = 0; i < MAX_DCP_AUDIO_CHANNELS; ++i) {
+ for (int i = 0; i < _channels; ++i) {
_channel_checkbox[i] = new wxCheckBox (this, wxID_ANY, std_to_wx (audio_channel_name (i)));
right->Add (_channel_checkbox[i], 0, wxEXPAND | wxALL, 3);
_channel_checkbox[i]->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AudioDialog::channel_clicked, this, _1));
shared_ptr<const Film> film = _film.lock ();
DCPOMATIC_ASSERT (film);
- boost::filesystem::path path = film->audio_analysis_path (_playlist);
-
+ boost::filesystem::path const path = film->audio_analysis_path (_playlist);
if (!boost::filesystem::exists (path)) {
_plot->set_analysis (shared_ptr<AudioAnalysis> ());
_analysis.reset ();
- shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, _playlist));
- _analysis_finished_connection = job->Finished.connect (bind (&AudioDialog::analysis_finished, this));
- JobManager::instance()->add (job);
+ JobManager::instance()->analyse_audio (film, _playlist, _analysis_finished_connection, bind (&AudioDialog::analysis_finished, this));
return;
}
_analysis.reset (new AudioAnalysis (path));
} catch (xmlpp::exception& e) {
/* Probably an old-style analysis file: recreate it */
- shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, _playlist));
- _analysis_finished_connection = job->Finished.connect (bind (&AudioDialog::analysis_finished, this));
- JobManager::instance()->add (job);
+ JobManager::instance()->analyse_audio (film, _playlist, _analysis_finished_connection, bind (&AudioDialog::analysis_finished, this));
return;
}
_plot->set_analysis (_analysis);
- _plot->set_gain_correction (gain_correction ());
- setup_peak_time ();
+ _plot->set_gain_correction (_analysis->gain_correction (_playlist));
+ setup_statistics ();
/* Set up some defaults if no check boxes are checked */
int i = 0;
- while (i < MAX_DCP_AUDIO_CHANNELS && (!_channel_checkbox[i] || !_channel_checkbox[i]->GetValue ())) {
+ while (i < _channels && (!_channel_checkbox[i] || !_channel_checkbox[i]->GetValue ())) {
++i;
}
- if (i == MAX_DCP_AUDIO_CHANNELS && _channel_checkbox[0]) {
+ if (i == _channels && _channel_checkbox[0]) {
_channel_checkbox[0]->SetValue (true);
_plot->set_channel_visible (0, true);
}
AudioDialog::channel_clicked (wxCommandEvent& ev)
{
int c = 0;
- while (c < MAX_DCP_AUDIO_CHANNELS && ev.GetEventObject() != _channel_checkbox[c]) {
+ while (c < _channels && ev.GetEventObject() != _channel_checkbox[c]) {
++c;
}
- DCPOMATIC_ASSERT (c < MAX_DCP_AUDIO_CHANNELS);
+ DCPOMATIC_ASSERT (c < _channels);
_plot->set_channel_visible (c, _channel_checkbox[c]->GetValue ());
}
if (p == AudioContentProperty::AUDIO_STREAMS) {
try_to_load_analysis ();
} else if (p == AudioContentProperty::AUDIO_GAIN) {
- if (_playlist->content().size() == 1) {
+ if (_playlist->content().size() == 1 && _analysis) {
/* We can use a short-cut to render the effect of this
change, rather than recalculating everything.
*/
- _plot->set_gain_correction (gain_correction ());
- setup_peak_time ();
+ _plot->set_gain_correction (_analysis->gain_correction (_playlist));
+ setup_statistics ();
} else {
try_to_load_analysis ();
}
}
void
-AudioDialog::setup_peak_time ()
+AudioDialog::setup_statistics ()
{
- if (!_analysis || !_analysis->peak ()) {
+ if (!_analysis) {
return;
}
return;
}
- float const peak_dB = 20 * log10 (_analysis->peak().get()) + gain_correction ();
+ if (static_cast<bool>(_analysis->sample_peak ())) {
- _peak_time->SetLabel (
- wxString::Format (
- _("Peak is %.2fdB at %s"),
- peak_dB,
- time_to_timecode (_analysis->peak_time().get(), film->video_frame_rate ()).data ()
- )
- );
+ float const peak_dB = 20 * log10 (_analysis->sample_peak().get()) + _analysis->gain_correction (_playlist);
- if (peak_dB > -3) {
- _peak_time->SetForegroundColour (wxColour (255, 0, 0));
- } else {
- _peak_time->SetForegroundColour (wxColour (0, 0, 0));
+ _sample_peak->SetLabel (
+ wxString::Format (
+ _("Sample peak is %.2fdB at %s"),
+ peak_dB,
+ time_to_timecode (_analysis->sample_peak_time().get(), film->video_frame_rate ()).data ()
+ )
+ );
+
+ if (peak_dB > -3) {
+ _sample_peak->SetForegroundColour (wxColour (255, 0, 0));
+ } else {
+ _sample_peak->SetForegroundColour (wxColour (0, 0, 0));
+ }
+ }
+
+ if (static_cast<bool>(_analysis->true_peak ())) {
+ float const peak_dB = 20 * log10 (_analysis->true_peak().get()) + _analysis->gain_correction (_playlist);
+
+ _true_peak->SetLabel (wxString::Format (_("True peak is %.2fdB"), peak_dB));
+
+ if (peak_dB > -3) {
+ _true_peak->SetForegroundColour (wxColour (255, 0, 0));
+ } else {
+ _true_peak->SetForegroundColour (wxColour (0, 0, 0));
+ }
+ }
+
+ /* XXX: check whether it's ok to add dB gain to these quantities */
+
+ if (static_cast<bool>(_analysis->integrated_loudness ())) {
+ _integrated_loudness->SetLabel (
+ wxString::Format (
+ _("Integrated loudness %.2f LUFS"),
+ _analysis->integrated_loudness().get() + _analysis->gain_correction (_playlist)
+ )
+ );
+ }
+
+ if (static_cast<bool>(_analysis->loudness_range ())) {
+ _loudness_range->SetLabel (
+ wxString::Format (
+ _("Loudness range %.2f LU"),
+ _analysis->loudness_range().get() + _analysis->gain_correction (_playlist)
+ )
+ );
}
}
try_to_load_analysis ();
return r;
}
-
-/** @return gain correction in dB required to be added to raw gain values to render
- * the dialog correctly.
- */
-float
-AudioDialog::gain_correction ()
-{
- if (_playlist->content().size() == 1 && _analysis->analysis_gain ()) {
- /* In this case we know that the analysis was of a single piece of content and
- we know that content's gain when the analysis was run. Hence we can work out
- what correction is now needed to make it look `right'.
- */
- shared_ptr<const AudioContent> ac = dynamic_pointer_cast<const AudioContent> (_playlist->content().front ());
- DCPOMATIC_ASSERT (ac);
- return ac->audio_gain() - _analysis->analysis_gain().get ();
- }
-
- return 0.0f;
-}
projects / dcpomatic.git / blobdiff