#include <stdint.h>
#include <cmath>
#include <ostream>
-#include <sstream>
#include <iomanip>
class dcpomatic_round_up_test;
* 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));
}
}
template <typename T>
- int64_t frames (T r) const {
- return rint (double (_t) * r / HZ);
+ int64_t frames_round (T r) const {
+ return llrint (_t * 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 {
+ return ceil (_t * r / HZ);
}
/** @param r Frames per second */
/* 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;
static Time<S, O> from_seconds (double s) {
- return Time<S, O> (s * HZ);
+ return Time<S, O> (llrint (s * HZ));
}
template <class T>
bool overlaps (ContentTimePeriod const & o) const;
bool contains (ContentTime const & o) const;
+
+ bool operator== (ContentTimePeriod const & o) const {
+ return from == o.from && to == o.to;
+ }
};
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);