#include "cross.h"
#include "util.h"
#include "raw_convert.h"
+#include "playlist.h"
+#include "audio_content.h"
#include <libxml++/libxml++.h>
#include <boost/filesystem.hpp>
#include <boost/foreach.hpp>
using std::max;
using std::list;
using boost::shared_ptr;
-
-AudioPoint::AudioPoint ()
-{
- for (int i = 0; i < COUNT; ++i) {
- _data[i] = 0;
- }
-}
-
-AudioPoint::AudioPoint (cxml::ConstNodePtr node)
-{
- _data[PEAK] = node->number_child<float> ("Peak");
- _data[RMS] = node->number_child<float> ("RMS");
-}
-
-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::as_xml (xmlpp::Element* parent) const
-{
- parent->add_child ("Peak")->add_child_text (raw_convert<string> (_data[PEAK]));
- parent->add_child ("RMS")->add_child_text (raw_convert<string> (_data[RMS]));
-}
+using boost::dynamic_pointer_cast;
AudioAnalysis::AudioAnalysis (int channels)
{
_data.push_back (channel);
}
- _peak = f.number_child<float> ("Peak");
- _peak_time = DCPTime (f.number_child<DCPTime::Type> ("PeakTime"));
+ _sample_peak = f.optional_number_child<float> ("Peak");
+ if (!_sample_peak) {
+ /* New key */
+ _sample_peak = f.optional_number_child<float> ("SamplePeak");
+ }
+
+ if (f.optional_number_child<DCPTime::Type> ("PeakTime")) {
+ _sample_peak_time = DCPTime (f.number_child<DCPTime::Type> ("PeakTime"));
+ } else if (f.optional_number_child<DCPTime::Type> ("SamplePeakTime")) {
+ _sample_peak_time = DCPTime (f.number_child<DCPTime::Type> ("SamplePeakTime"));
+ }
+
+ _true_peak = f.optional_number_child<float> ("TruePeak");
+ _integrated_loudness = f.optional_number_child<float> ("IntegratedLoudness");
+ _loudness_range = f.optional_number_child<float> ("LoudnessRange");
+
_analysis_gain = f.optional_number_child<double> ("AnalysisGain");
}
}
}
- if (_peak) {
- root->add_child("Peak")->add_child_text (raw_convert<string> (_peak.get ()));
- root->add_child("PeakTime")->add_child_text (raw_convert<string> (_peak_time.get().get ()));
+ if (_sample_peak) {
+ root->add_child("SamplePeak")->add_child_text (raw_convert<string> (_sample_peak.get ()));
+ root->add_child("SamplePeakTime")->add_child_text (raw_convert<string> (_sample_peak_time.get().get ()));
+ }
+
+ if (_true_peak) {
+ root->add_child("TruePeak")->add_child_text (raw_convert<string> (_true_peak.get ()));
+ }
+
+ if (_integrated_loudness) {
+ root->add_child("IntegratedLoudness")->add_child_text (raw_convert<string> (_integrated_loudness.get ()));
+ }
+
+ if (_loudness_range) {
+ root->add_child("LoudnessRange")->add_child_text (raw_convert<string> (_loudness_range.get ()));
}
if (_analysis_gain) {
doc->write_to_file_formatted (filename.string ());
}
+
+float
+AudioAnalysis::gain_correction (shared_ptr<const Playlist> 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'.
+ */
+ shared_ptr<const AudioContent> ac = dynamic_pointer_cast<const AudioContent> (playlist->content().front ());
+ DCPOMATIC_ASSERT (ac);
+ return ac->audio_gain() - analysis_gain().get ();
+ }
+
+ return 0.0f;
+}