/*
- Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#include "frame_rate_change.h"
#include "dcpomatic_assert.h"
-#include <locked_sstream.h>
#include <boost/optional.hpp>
+#include <boost/foreach.hpp>
#include <stdint.h>
#include <cmath>
#include <ostream>
#include <iomanip>
+#include <cstdio>
-class dcpomatic_round_up_test;
+struct dcpomatic_time_ceil_test;
+struct dcpomatic_time_floor_test;
+
+namespace dcpomatic {
/** A time in seconds, expressed as a number scaled up by Time::HZ. We want two different
- * versions of this class, ContentTime and DCPTime, and we want it to be impossible to
+ * versions of this class, dcpomatic::ContentTime and dcpomatic::DCPTime, and we want it to be impossible to
* convert implicitly between the two. Hence there's this template hack. I'm not
* sure if it's the best way to do it.
*
return *this;
}
+ Time<S, O> operator/ (int o) const {
+ return Time<S, O> (_t / o);
+ }
+
/** Round up to the nearest sampling interval
* at some sampling rate.
* @param r Sampling rate.
*/
- 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));
+ Time<S, O> ceil (double r) const {
+ return Time<S, O> (llrint (HZ * frames_ceil(r) / r));
+ }
+
+ Time<S, O> floor (double r) const {
+ return Time<S, O> (llrint (HZ * frames_floor(r) / r));
+ }
+
+ Time<S, O> round (double r) const {
+ return Time<S, O> (llrint (HZ * frames_round(r) / r));
}
double seconds () const {
template <typename T>
int64_t frames_floor (T r) const {
- return floor (_t * r / HZ);
+ return ::floor (_t * r / HZ);
}
template <typename T>
the calculation will round down before we get the chance
to ceil().
*/
- return ceil (_t * double(r) / HZ);
+ return ::ceil (_t * double(r) / HZ);
}
- /** @param r Frames per second */
+ /** Split a time into hours, minutes, seconds and frames.
+ * @param r Frames per second.
+ * @param h Returned hours.
+ * @param m Returned minutes.
+ * @param s Returned seconds.
+ * @param f Returned frames.
+ */
template <typename T>
void split (T r, int& h, int& m, int& s, int& f) const
{
int f;
split (r, h, m, s, f);
- locked_stringstream o;
- o.width (2);
- o.fill ('0');
- o << std::setw(2) << std::setfill('0') << h << ":"
- << std::setw(2) << std::setfill('0') << m << ":"
- << std::setw(2) << std::setfill('0') << s << ":"
- << std::setw(2) << std::setfill('0') << f;
- return o.str ();
+ char buffer[128];
+ snprintf (buffer, sizeof (buffer), "%02d:%02d:%02d:%02d", h, m, s, f);
+ return buffer;
}
return Time<S, O> (INT64_MAX);
}
+ static const int HZ = 96000;
+
private:
- friend struct dcptime_round_up_test;
+ friend struct ::dcpomatic_time_ceil_test;
+ friend struct ::dcpomatic_time_floor_test;
Type _t;
- static const int HZ = 96000;
};
class ContentTimeDifferentiator {};
return TimePeriod<T> (from + o, to + o);
}
- boost::optional<TimePeriod<T> > overlap (TimePeriod<T> const & other) {
+ boost::optional<TimePeriod<T> > overlap (TimePeriod<T> const & other) const {
T const max_from = std::max (from, other.from);
T const min_to = std::min (to, other.to);
return (from <= other && other < to);
}
+ bool operator< (TimePeriod<T> const & o) const {
+ if (from != o.from) {
+ return from < o.from;
+ }
+ return to < o.to;
+ }
+
bool operator== (TimePeriod<T> const & other) const {
return from == other.from && to == other.to;
}
+
+ bool operator!= (TimePeriod<T> const & other) const {
+ return !(*this == other);
+ }
};
+/** @param A Period which is subtracted from.
+ * @param B Periods to subtract from `A', must be in ascending order of start time and must not overlap.
+ */
+template <class T>
+std::list<TimePeriod<T> > subtract (TimePeriod<T> A, std::list<TimePeriod<T> > const & B)
+{
+ std::list<TimePeriod<T> > result;
+ result.push_back (A);
+
+ BOOST_FOREACH (TimePeriod<T> i, B) {
+ std::list<TimePeriod<T> > new_result;
+ BOOST_FOREACH (TimePeriod<T> j, result) {
+ boost::optional<TimePeriod<T> > ov = i.overlap (j);
+ if (ov) {
+ if (*ov == i) {
+ /* A contains all of B */
+ if (i.from != j.from) {
+ new_result.push_back (TimePeriod<T> (j.from, i.from));
+ }
+ if (i.to != j.to) {
+ new_result.push_back (TimePeriod<T> (i.to, j.to));
+ }
+ } else if (*ov == j) {
+ /* B contains all of A */
+ } else if (i.from < j.from) {
+ /* B overlaps start of A */
+ new_result.push_back (TimePeriod<T> (i.to, j.to));
+ } else if (i.to > j.to) {
+ /* B overlaps end of A */
+ new_result.push_back (TimePeriod<T> (j.from, i.from));
+ }
+ } else {
+ new_result.push_back (j);
+ }
+ }
+ result = new_result;
+ }
+
+ return result;
+}
+
typedef TimePeriod<ContentTime> ContentTimePeriod;
typedef TimePeriod<DCPTime> DCPTimePeriod;
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);
+std::string to_string (ContentTime t);
+std::string to_string (DCPTime t);
+std::string to_string (DCPTimePeriod p);
+
+}
#endif
projects / dcpomatic.git / blobdiff