X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_analysis.cc;h=22c14c7647ecc3de54f5a918ea1820e47623c485;hb=a5d004b0773f633401528392fc28e66d70e13ac8;hp=d99b01ce641abe8f75fc42009ebb8d9c97921083;hpb=65b331d32c383f3a9049f29bf03ab3fe3193b31a;p=dcpomatic.git diff --git a/src/lib/audio_analysis.cc b/src/lib/audio_analysis.cc index d99b01ce6..22c14c764 100644 --- a/src/lib/audio_analysis.cc +++ b/src/lib/audio_analysis.cc @@ -1,31 +1,34 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2018 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ #include "audio_analysis.h" #include "cross.h" #include "util.h" -#include "raw_convert.h" #include "playlist.h" #include "audio_content.h" +#include "warnings.h" +#include +DCPOMATIC_DISABLE_WARNINGS #include +DCPOMATIC_ENABLE_WARNINGS #include -#include #include #include #include @@ -38,9 +41,16 @@ using std::string; using std::vector; using std::cout; using std::max; +using std::pair; +using std::make_pair; using std::list; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using boost::optional; +using std::dynamic_pointer_cast; +using dcp::raw_convert; +using namespace dcpomatic; + +int const AudioAnalysis::_current_state_version = 3; AudioAnalysis::AudioAnalysis (int channels) { @@ -52,33 +62,41 @@ AudioAnalysis::AudioAnalysis (boost::filesystem::path filename) cxml::Document f ("AudioAnalysis"); f.read_file (filename); - BOOST_FOREACH (cxml::NodePtr i, f.node_children ("Channel")) { + 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"); + } + + 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); } - _sample_peak = f.optional_number_child ("Peak"); - if (!_sample_peak) { - /* New key */ - _sample_peak = f.optional_number_child ("SamplePeak"); + for (auto i: f.node_children ("SamplePeak")) { + _sample_peak.push_back ( + PeakTime ( + dcp::raw_convert(i->content()), DCPTime(i->number_attribute("Time")) + ) + ); } - if (f.optional_number_child ("PeakTime")) { - _sample_peak_time = DCPTime (f.number_child ("PeakTime")); - } else if (f.optional_number_child ("SamplePeakTime")) { - _sample_peak_time = DCPTime (f.number_child ("SamplePeakTime")); + for (auto i: f.node_children ("TruePeak")) { + _true_peak.push_back (dcp::raw_convert (i->content ())); } - _true_peak = f.optional_number_child ("TruePeak"); _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"); + + _leqm = f.optional_number_child("Leqm"); } void @@ -114,20 +132,23 @@ AudioAnalysis::write (boost::filesystem::path filename) shared_ptr doc (new xmlpp::Document); xmlpp::Element* root = doc->create_root_node ("AudioAnalysis"); - BOOST_FOREACH (vector& i, _data) { + root->add_child("Version")->add_child_text (raw_convert (_current_state_version)); + + for (auto& i: _data) { xmlpp::Element* channel = root->add_child ("Channel"); - BOOST_FOREACH (AudioPoint& j, i) { + for (auto& j: i) { j.as_xml (channel->add_child ("Point")); } } - if (_sample_peak) { - root->add_child("SamplePeak")->add_child_text (raw_convert (_sample_peak.get ())); - root->add_child("SamplePeakTime")->add_child_text (raw_convert (_sample_peak_time.get().get ())); + for (size_t i = 0; i < _sample_peak.size(); ++i) { + xmlpp::Element* 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())); } - if (_true_peak) { - root->add_child("TruePeak")->add_child_text (raw_convert (_true_peak.get ())); + for (auto i: _true_peak) { + root->add_child("TruePeak")->add_child_text (raw_convert (i)); } if (_integrated_loudness) { @@ -142,6 +163,13 @@ AudioAnalysis::write (boost::filesystem::path filename) root->add_child("AnalysisGain")->add_child_text (raw_convert (_analysis_gain.get ())); } + root->add_child("SamplesPerPoint")->add_child_text (raw_convert (_samples_per_point)); + root->add_child("SampleRate")->add_child_text (raw_convert (_sample_rate)); + + if (_leqm) { + root->add_child("Leqm")->add_child_text(raw_convert(*_leqm)); + } + doc->write_to_file_formatted (filename.string ()); } @@ -154,8 +182,42 @@ 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->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 ()); + + optional pt; + int c = 0; + + for (size_t i = 0; i < _sample_peak.size(); ++i) { + if (!pt || _sample_peak[i].peak > pt->peak) { + pt = _sample_peak[i]; + c = i; + } + } + + return make_pair (pt.get(), c); +} + +optional +AudioAnalysis::overall_true_peak () const +{ + optional p; + + for (auto i: _true_peak) { + if (!p || i > *p) { + p = i; + } + } + + return p; +} +