X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Faudio_analysis.cc;h=1863e38eeae85bf633c79151dc335fd4e3d9be09;hp=ee34b0d80b7fc2d3168f557e3947c68f85c995c9;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hpb=fc96a4b3d6985f28db6bc0e9418e98cc5bec87e3 diff --git a/src/lib/audio_analysis.cc b/src/lib/audio_analysis.cc index ee34b0d80..1863e38ee 100644 --- a/src/lib/audio_analysis.cc +++ b/src/lib/audio_analysis.cc @@ -1,32 +1,37 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2015 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 "dcpomatic_assert.h" #include "cross.h" +#include "util.h" +#include "raw_convert.h" +#include "playlist.h" +#include "audio_content.h" +#include #include +#include #include -#include #include -#include #include #include +#include using std::ostream; using std::istream; @@ -35,53 +40,8 @@ using std::vector; using std::cout; using std::max; using std::list; - -AudioPoint::AudioPoint () -{ - for (int i = 0; i < COUNT; ++i) { - _data[i] = 0; - } -} - -AudioPoint::AudioPoint (FILE* f) -{ - for (int i = 0; i < COUNT; ++i) { - int n = fscanf (f, "%f", &_data[i]); - if (n != 1) { - _data[i] = 0; - } - } -} - -AudioPoint::AudioPoint (AudioPoint const & other) -{ - for (int i = 0; i < COUNT; ++i) { - _data[i] = other._data[i]; - } -} - -AudioPoint & -AudioPoint::operator= (AudioPoint const & other) -{ - if (this == &other) { - return *this; - } - - for (int i = 0; i < COUNT; ++i) { - _data[i] = other._data[i]; - } - - return *this; -} - -void -AudioPoint::write (FILE* f) const -{ - for (int i = 0; i < COUNT; ++i) { - fprintf (f, "%f\n", _data[i]); - } -} - +using boost::shared_ptr; +using boost::dynamic_pointer_cast; AudioAnalysis::AudioAnalysis (int channels) { @@ -90,44 +50,36 @@ AudioAnalysis::AudioAnalysis (int channels) AudioAnalysis::AudioAnalysis (boost::filesystem::path filename) { - FILE* f = fopen_boost (filename, "r"); - if (!f) { - throw OpenFileError (filename); - } + cxml::Document f ("AudioAnalysis"); + f.read_file (filename); - int channels = 0; - fscanf (f, "%d", &channels); - _data.resize (channels); + BOOST_FOREACH (cxml::NodePtr i, f.node_children ("Channel")) { + vector channel; - for (int i = 0; i < channels; ++i) { - int points; - fscanf (f, "%d", &points); - if (feof (f)) { - fclose (f); - return; - } - - for (int j = 0; j < points; ++j) { - _data[i].push_back (AudioPoint (f)); - if (feof (f)) { - fclose (f); - return; - } + BOOST_FOREACH (cxml::NodePtr 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"); } - /* These may not exist in old analysis files, so be careful - about reading them. - */ - - float peak; - DCPTime::Type peak_time; - if (fscanf (f, "%f%" SCNd64, &peak, &peak_time) == 2) { - _peak = peak; - _peak_time = DCPTime (peak_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")); } - - fclose (f); + + _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"); } void @@ -160,26 +112,51 @@ AudioAnalysis::points (int c) const void AudioAnalysis::write (boost::filesystem::path filename) { - boost::filesystem::path tmp = filename; - tmp.replace_extension (".tmp"); + shared_ptr doc (new xmlpp::Document); + xmlpp::Element* root = doc->create_root_node ("AudioAnalysis"); + + BOOST_FOREACH (vector& i, _data) { + xmlpp::Element* channel = root->add_child ("Channel"); + BOOST_FOREACH (AudioPoint& j, i) { + j.as_xml (channel->add_child ("Point")); + } + } - FILE* f = fopen_boost (tmp, "w"); - if (!f) { - throw OpenFileError (tmp); + 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 ())); } - fprintf (f, "%ld\n", _data.size ()); - for (vector >::iterator i = _data.begin(); i != _data.end(); ++i) { - fprintf (f, "%ld\n", i->size ()); - for (vector::iterator j = i->begin(); j != i->end(); ++j) { - j->write (f); - } + if (_true_peak) { + root->add_child("TruePeak")->add_child_text (raw_convert (_true_peak.get ())); + } + + if (_integrated_loudness) { + root->add_child("IntegratedLoudness")->add_child_text (raw_convert (_integrated_loudness.get ())); + } + + if (_loudness_range) { + root->add_child("LoudnessRange")->add_child_text (raw_convert (_loudness_range.get ())); + } + + if (_analysis_gain) { + root->add_child("AnalysisGain")->add_child_text (raw_convert (_analysis_gain.get ())); } - if (_peak) { - fprintf (f, "%f%" PRId64, _peak.get (), _peak_time.get().get ()); + doc->write_to_file_formatted (filename.string ()); +} + +float +AudioAnalysis::gain_correction (shared_ptr playlist) +{ + if (playlist->content().size() == 1 && 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'. + */ + DCPOMATIC_ASSERT (playlist->content().front()->audio); + return playlist->content().front()->audio->gain() - analysis_gain().get (); } - fclose (f); - boost::filesystem::rename (tmp, filename); + return 0.0f; }