X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_analysis.h;h=6da651c95a06bf670719222052a307b43a160b25;hb=c6871fe8617b3de03662b7630355059393bf8043;hp=0d06e5973eca297bcf6d6e4f1240059ab2b68691;hpb=b0834f33e972a6e7b0d234d09e420007943a136d;p=dcpomatic.git

diff --git a/src/lib/audio_analysis.h b/src/lib/audio_analysis.h
index 0d06e5973..6da651c95 100644
--- a/src/lib/audio_analysis.h
+++ b/src/lib/audio_analysis.h
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    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 <http://www.gnu.org/licenses/>.
 
 */
 
@@ -36,25 +37,59 @@ class Playlist;
 class AudioAnalysis : public boost::noncopyable
 {
 public:
-	AudioAnalysis (int c);
-	AudioAnalysis (boost::filesystem::path);
+	explicit AudioAnalysis (int c);
+	explicit AudioAnalysis (boost::filesystem::path);
 
 	void add_point (int c, AudioPoint const & p);
-	void set_peak (float peak, DCPTime time) {
-		_peak = peak;
-		_peak_time = time;
+
+	struct PeakTime {
+		PeakTime (float p, DCPTime t)
+			: peak (p)
+			, time (t)
+		{}
+
+		float peak;
+		DCPTime time;
+	};
+
+	void set_sample_peak (std::vector<PeakTime> peak) {
+		_sample_peak = peak;
+	}
+
+	void set_true_peak (std::vector<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> peak () const {
-		return _peak;
+	std::vector<PeakTime> sample_peak () const {
+		return _sample_peak;
+	}
+
+	std::pair<PeakTime, int> overall_sample_peak () const;
+
+	std::vector<float> true_peak () const {
+		return _true_peak;
 	}
 
-	boost::optional<DCPTime> peak_time () const {
-		return _peak_time;
+	boost::optional<float> overall_true_peak () const;
+
+	boost::optional<float> integrated_loudness () const {
+		return _integrated_loudness;
+	}
+
+	boost::optional<float> loudness_range () const {
+		return _loudness_range;
 	}
 
 	boost::optional<double> analysis_gain () const {
@@ -71,13 +106,17 @@ public:
 
 private:
 	std::vector<std::vector<AudioPoint> > _data;
-	boost::optional<float> _peak;
-	boost::optional<DCPTime> _peak_time;
+	std::vector<PeakTime> _sample_peak;
+	std::vector<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;
+
+	static int const _current_state_version;
 };
 
 #endif