X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_analysis.h;h=3684db96abdd97bfd48fa3693c3e2b46abcc5ecf;hb=95c48153421b1a6e0d7ca6cf5e67cd7623c03dc7;hp=9acd491ce96738897dc5ac69b0fc4b6f58262f20;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/lib/audio_analysis.h b/src/lib/audio_analysis.h
index 9acd491ce..3684db96a 100644
--- a/src/lib/audio_analysis.h
+++ b/src/lib/audio_analysis.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -37,17 +37,26 @@ 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_sample_peak (float peak, DCPTime time) {
+	struct PeakTime {
+		PeakTime (float p, dcpomatic::DCPTime t)
+			: peak (p)
+			, time (t)
+		{}
+
+		float peak;
+		dcpomatic::DCPTime time;
+	};
+
+	void set_sample_peak (std::vector<PeakTime> peak) {
 		_sample_peak = peak;
-		_sample_peak_time = time;
 	}
 
-	void set_true_peak (float peak) {
+	void set_true_peak (std::vector<float> peak) {
 		_true_peak = peak;
 	}
 
@@ -63,18 +72,18 @@ public:
 	int points (int c) const;
 	int channels () const;
 
-	boost::optional<float> sample_peak () const {
+	std::vector<PeakTime> sample_peak () const {
 		return _sample_peak;
 	}
 
-	boost::optional<DCPTime> sample_peak_time () const {
-		return _sample_peak_time;
-	}
+	std::pair<PeakTime, int> overall_sample_peak () const;
 
-	boost::optional<float> true_peak () const {
+	std::vector<float> true_peak () const {
 		return _true_peak;
 	}
 
+	boost::optional<float> overall_true_peak () const;
+
 	boost::optional<float> integrated_loudness () const {
 		return _integrated_loudness;
 	}
@@ -91,15 +100,30 @@ public:
 		_analysis_gain = gain;
 	}
 
+	int64_t samples_per_point () const {
+		return _samples_per_point;
+	}
+
+	void set_samples_per_point (int64_t spp) {
+		_samples_per_point = spp;
+	}
+
+	int sample_rate () const {
+		return _sample_rate;
+	}
+
+	void set_sample_rate (int sr) {
+		_sample_rate = sr;
+	}
+
 	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;
+	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
@@ -107,6 +131,10 @@ private:
 	 *  happened.
 	 */
 	boost::optional<double> _analysis_gain;
+	int64_t _samples_per_point;
+	int _sample_rate;
+
+	static int const _current_state_version;
 };
 
 #endif