X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Faudio_analysis.h;h=9594534960a311aa2fdac83d2d6d1ca98e32d584;hb=d60b9d006fee94fab80ee86fe1149de7f2e76750;hp=b91a1cf5123d3c43c3a1b40418e279ff273b4630;hpb=f1d30fb114b3b2c6ccd8fdf5823e7cd6b26c1eef;p=dcpomatic.git

diff --git a/src/lib/audio_analysis.h b/src/lib/audio_analysis.h
index b91a1cf51..959453496 100644
--- a/src/lib/audio_analysis.h
+++ b/src/lib/audio_analysis.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,52 +17,22 @@
 
 */
 
-/** @file  src/lib/audio_analysis.h
- *  @brief AudioAnalysis and AudioPoint classes.
- */
-
 #ifndef DCPOMATIC_AUDIO_ANALYSIS_H
 #define DCPOMATIC_AUDIO_ANALYSIS_H
 
-#include <vector>
-#include <list>
+#include "dcpomatic_time.h"
+#include "audio_point.h"
+#include <libcxml/cxml.h>
+#include <boost/optional.hpp>
 #include <boost/filesystem.hpp>
+#include <vector>
 
-/** @class AudioPoint
- *  @brief A single point of an audio analysis for one portion of one channel.
- */
-class AudioPoint
-{
-public:
-	enum Type {
-		PEAK,
-		RMS,
-		COUNT
-	};
-
-	AudioPoint ();
-	AudioPoint (FILE *);
-	AudioPoint (AudioPoint const &);
-	AudioPoint& operator= (AudioPoint const &);
-
-	void write (FILE *) const;
-	
-	float& operator[] (int t) {
-		return _data[t];
-	}
+namespace xmlpp {
+	class Element;
+}
 
-private:
-	float _data[COUNT];
-};
+class Playlist;
 
-/** @class AudioAnalysis
- *  @brief An analysis of the audio data in a piece of AudioContent.
- *
- *  This is a set of AudioPoints for each channel.  The AudioPoints
- *  each represent some measurement of the audio over a portion of the
- *  content.  For example each AudioPoint may give the RMS level of
- *  a 1-minute portion of the audio.
- */
 class AudioAnalysis : public boost::noncopyable
 {
 public:
@@ -70,15 +40,72 @@ public:
 	AudioAnalysis (boost::filesystem::path);
 
 	void add_point (int c, AudioPoint const & p);
-	
+
+	void set_sample_peak (float peak, DCPTime time) {
+		_sample_peak = peak;
+		_sample_peak_time = time;
+	}
+
+	void set_true_peak (float peak) {
+		_true_peak = peak;
+	}
+
+	void set_integrated_loudness (float l) {
+		_integrated_loudness = l;
+	}
+
+	void set_loudness_range (float r) {
+		_loudness_range = r;
+	}
+
 	AudioPoint get_point (int c, int p) const;
 	int points (int c) const;
 	int channels () const;
 
+	boost::optional<float> sample_peak () const {
+		return _sample_peak;
+	}
+
+	boost::optional<DCPTime> sample_peak_time () const {
+		return _sample_peak_time;
+	}
+
+	boost::optional<float> true_peak () const {
+		return _true_peak;
+	}
+
+	boost::optional<float> integrated_loudness () const {
+		return _integrated_loudness;
+	}
+
+	boost::optional<float> loudness_range () const {
+		return _loudness_range;
+	}
+
+	boost::optional<double> analysis_gain () const {
+		return _analysis_gain;
+	}
+
+	void set_analysis_gain (double gain) {
+		_analysis_gain = gain;
+	}
+
 	void write (boost::filesystem::path);
 
+	float gain_correction (boost::shared_ptr<const Playlist> playlist);
+
 private:
 	std::vector<std::vector<AudioPoint> > _data;
+	boost::optional<float> _sample_peak;
+	boost::optional<DCPTime> _sample_peak_time;
+	boost::optional<float> _true_peak;
+	boost::optional<float> _integrated_loudness;
+	boost::optional<float> _loudness_range;
+	/** If this analysis was run on a single piece of
+	 *  content we store its gain in dB when the analysis
+	 *  happened.
+	 */
+	boost::optional<double> _analysis_gain;
 };
 
 #endif