X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Faudio_analysis.cc;h=721ffed07c6e28464ddb159877527c39c8d712db;hp=446fcccef1607323d7851dbffe98114cda5fb841;hb=HEAD;hpb=fa5f3a8bf77209da27acc33cf144e2e4500a2600 diff --git a/src/lib/audio_analysis.cc b/src/lib/audio_analysis.cc index 446fcccef..b8c2e072d 100644 --- a/src/lib/audio_analysis.cc +++ b/src/lib/audio_analysis.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2018 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,85 +18,94 @@ */ + #include "audio_analysis.h" +#include "audio_content.h" #include "cross.h" -#include "util.h" #include "playlist.h" -#include "audio_content.h" +#include "util.h" #include +#include +LIBDCP_DISABLE_WARNINGS #include +LIBDCP_ENABLE_WARNINGS #include -#include #include #include #include #include #include -using std::ostream; -using std::istream; -using std::string; -using std::vector; + using std::cout; +using std::dynamic_pointer_cast; +using std::istream; +using std::list; +using std::make_pair; +using std::make_shared; using std::max; +using std::ostream; using std::pair; -using std::make_pair; -using std::list; -using boost::shared_ptr; +using std::shared_ptr; +using std::string; +using std::vector; using boost::optional; -using boost::dynamic_pointer_cast; using dcp::raw_convert; using namespace dcpomatic; + int const AudioAnalysis::_current_state_version = 3; + AudioAnalysis::AudioAnalysis (int channels) { _data.resize (channels); } + AudioAnalysis::AudioAnalysis (boost::filesystem::path filename) { cxml::Document f ("AudioAnalysis"); - f.read_file (filename); + f.read_file(dcp::filesystem::fix_long_path(filename)); if (f.optional_number_child("Version").get_value_or(1) < _current_state_version) { /* Too old. Throw an exception so that this analysis is re-run. */ throw OldFormatError ("Audio analysis file is too old"); } - BOOST_FOREACH (cxml::NodePtr i, f.node_children ("Channel")) { + for (auto i: f.node_children("Channel")) { vector channel; - BOOST_FOREACH (cxml::NodePtr j, i->node_children ("Point")) { - channel.push_back (AudioPoint (j)); + for (auto j: i->node_children("Point")) { + channel.push_back (AudioPoint(j)); } _data.push_back (channel); } - BOOST_FOREACH (cxml::ConstNodePtr i, f.node_children ("SamplePeak")) { + for (auto i: f.node_children ("SamplePeak")) { _sample_peak.push_back ( - PeakTime ( + PeakTime( dcp::raw_convert(i->content()), DCPTime(i->number_attribute("Time")) ) ); } - BOOST_FOREACH (cxml::ConstNodePtr i, f.node_children ("TruePeak")) { - _true_peak.push_back (dcp::raw_convert (i->content ())); + for (auto i: f.node_children("TruePeak")) { + _true_peak.push_back (dcp::raw_convert(i->content())); } - _integrated_loudness = f.optional_number_child ("IntegratedLoudness"); - _loudness_range = f.optional_number_child ("LoudnessRange"); + _integrated_loudness = f.optional_number_child("IntegratedLoudness"); + _loudness_range = f.optional_number_child("LoudnessRange"); - _analysis_gain = f.optional_number_child ("AnalysisGain"); - _samples_per_point = f.number_child ("SamplesPerPoint"); - _sample_rate = f.number_child ("SampleRate"); + _analysis_gain = f.optional_number_child("AnalysisGain"); + _samples_per_point = f.number_child("SamplesPerPoint"); + _sample_rate = f.number_child("SampleRate"); _leqm = f.optional_number_child("Leqm"); } + void AudioAnalysis::add_point (int c, AudioPoint const & p) { @@ -104,48 +113,52 @@ AudioAnalysis::add_point (int c, AudioPoint const & p) _data[c].push_back (p); } + AudioPoint AudioAnalysis::get_point (int c, int p) const { - DCPOMATIC_ASSERT (p < points (c)); + DCPOMATIC_ASSERT (p < points(c)); return _data[c][p]; } + int AudioAnalysis::channels () const { return _data.size (); } + int AudioAnalysis::points (int c) const { - DCPOMATIC_ASSERT (c < channels ()); + DCPOMATIC_ASSERT (c < channels()); return _data[c].size (); } + void AudioAnalysis::write (boost::filesystem::path filename) { - shared_ptr doc (new xmlpp::Document); + auto doc = make_shared(); xmlpp::Element* root = doc->create_root_node ("AudioAnalysis"); - root->add_child("Version")->add_child_text (raw_convert (_current_state_version)); + root->add_child("Version")->add_child_text(raw_convert(_current_state_version)); - BOOST_FOREACH (vector& i, _data) { - xmlpp::Element* channel = root->add_child ("Channel"); - BOOST_FOREACH (AudioPoint& j, i) { + for (auto& i: _data) { + auto channel = root->add_child ("Channel"); + for (auto& j: i) { j.as_xml (channel->add_child ("Point")); } } for (size_t i = 0; i < _sample_peak.size(); ++i) { - xmlpp::Element* n = root->add_child("SamplePeak"); + auto n = root->add_child("SamplePeak"); n->add_child_text (raw_convert (_sample_peak[i].peak)); n->set_attribute ("Time", raw_convert (_sample_peak[i].time.get())); } - BOOST_FOREACH (float i, _true_peak) { + for (auto i: _true_peak) { root->add_child("TruePeak")->add_child_text (raw_convert (i)); } @@ -171,6 +184,7 @@ AudioAnalysis::write (boost::filesystem::path filename) doc->write_to_file_formatted (filename.string ()); } + float AudioAnalysis::gain_correction (shared_ptr playlist) { @@ -180,17 +194,18 @@ AudioAnalysis::gain_correction (shared_ptr playlist) what correction is now needed to make it look `right'. */ DCPOMATIC_ASSERT (playlist->content().front()->audio); - return playlist->content().front()->audio->gain() - analysis_gain().get (); + return playlist->content().front()->audio->gain() - analysis_gain().get(); } return 0.0f; } + /** @return Peak across all channels, and the channel number it is on */ pair AudioAnalysis::overall_sample_peak () const { - DCPOMATIC_ASSERT (!_sample_peak.empty ()); + DCPOMATIC_ASSERT (!_sample_peak.empty()); optional pt; int c = 0; @@ -205,12 +220,13 @@ AudioAnalysis::overall_sample_peak () const return make_pair (pt.get(), c); } + optional AudioAnalysis::overall_true_peak () const { optional p; - BOOST_FOREACH (float i, _true_peak) { + for (auto i: _true_peak) { if (!p || i > *p) { p = i; }