X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcpomatic_time.h;h=ac16830eeaf0f43257e24e22ad7b4cdf12900ff8;hb=bd81f33a39c6d20e78fce0d5be3b2d487b6df344;hp=4f95b64ffe64fe2be69409dca18e26788299a975;hpb=0d6a18d8c1d80f4badb06929b90515bf121595b5;p=dcpomatic.git

diff --git a/src/lib/dcpomatic_time.h b/src/lib/dcpomatic_time.h
index 4f95b64ff..ac16830ee 100644
--- a/src/lib/dcpomatic_time.h
+++ b/src/lib/dcpomatic_time.h
@@ -30,7 +30,6 @@
 #include <stdint.h>
 #include <cmath>
 #include <ostream>
-#include <sstream>
 #include <iomanip>
 
 class dcpomatic_round_up_test;
@@ -117,8 +116,8 @@ public:
 	 *  at some sampling rate.
 	 *  @param r Sampling rate.
 	 */
-	Time<S, O> round_up (float r) {
-		Type const n = rint (HZ / r);
+	Time<S, O> round_up (float r) const {
+		Type const n = llrintf (HZ / r);
 		Type const a = _t + n - 1;
 		return Time<S, O> (a - (a % n));
 	}
@@ -132,8 +131,26 @@ public:
 	}
 
 	template <typename T>
-	int64_t frames (T r) const {
-		return floor (double (_t) * r / HZ);
+	int64_t frames_round (T r) const {
+		/* We must cast to double here otherwise if T is integer
+		   the calculation will round down before we get the chance
+		   to llrint().
+		*/
+		return llrint (_t * double(r) / HZ);
+	}
+
+	template <typename T>
+	int64_t frames_floor (T r) const {
+		return floor (_t * r / HZ);
+	}
+
+	template <typename T>
+	int64_t frames_ceil (T r) const {
+		/* We must cast to double here otherwise if T is integer
+		   the calculation will round down before we get the chance
+		   to ceil().
+		*/
+		return ceil (_t * double(r) / HZ);
 	}
 
 	/** @param r Frames per second */
@@ -143,7 +160,7 @@ public:
 		/* Do this calculation with frames so that we can round
 		   to a frame boundary at the start rather than the end.
 		*/
-		int64_t ff = frames (r);
+		int64_t ff = frames_round (r);
 
 		h = ff / (3600 * r);
 		ff -= h * 3600 * r;
@@ -175,7 +192,7 @@ public:
 
 
 	static Time<S, O> from_seconds (double s) {
-		return Time<S, O> (rint (s * HZ));
+		return Time<S, O> (llrint (s * HZ));
 	}
 
 	template <class T>
@@ -219,32 +236,52 @@ typedef Time<ContentTimeDifferentiator, DCPTimeDifferentiator> ContentTime;
 /** Time relative to the start of the output DCP in its frame rate */
 typedef Time<DCPTimeDifferentiator, ContentTimeDifferentiator> DCPTime;
 
-class ContentTimePeriod
+template <class T>
+class TimePeriod
 {
 public:
-	ContentTimePeriod () {}
+	TimePeriod () {}
 
-	ContentTimePeriod (ContentTime f, ContentTime t)
+	TimePeriod (T f, T t)
 		: from (f)
 		, to (t)
 	{}
 
-	ContentTime from;
-	ContentTime to;
+	/** start time of sampling interval that the period is from */
+	T from;
+	/** start time of next sampling interval after the period */
+	T to;
 
-	ContentTimePeriod operator+ (ContentTime const & o) const {
-		return ContentTimePeriod (from + o, to + o);
+	T duration () const {
+		return to - from;
 	}
 
-	bool overlaps (ContentTimePeriod const & o) const;
-	bool contains (ContentTime const & o) const;
+	TimePeriod<T> operator+ (T const & o) const {
+		return TimePeriod<T> (from + o, to + o);
+	}
+
+	bool overlaps (TimePeriod<T> const & other) const {
+		return (from < other.to && to > other.from);
+	}
+
+	bool contains (T const & other) const {
+		return (from <= other && other < to);
+	}
+
+	bool operator== (TimePeriod<T> const & other) const {
+		return from == other.from && to == other.to;
+	}
 };
 
+typedef TimePeriod<ContentTime> ContentTimePeriod;
+typedef TimePeriod<DCPTime> DCPTimePeriod;
+
 DCPTime min (DCPTime a, DCPTime b);
 DCPTime max (DCPTime a, DCPTime b);
 ContentTime min (ContentTime a, ContentTime b);
 ContentTime max (ContentTime a, ContentTime b);
 std::ostream& operator<< (std::ostream& s, ContentTime t);
 std::ostream& operator<< (std::ostream& s, DCPTime t);
+std::ostream& operator<< (std::ostream& s, DCPTimePeriod p);
 
 #endif