diff options
Diffstat (limited to 'src/lib/dcpomatic_time.h')
| -rw-r--r-- | src/lib/dcpomatic_time.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/lib/dcpomatic_time.h b/src/lib/dcpomatic_time.h index 893bce257..16d93ca28 100644 --- a/src/lib/dcpomatic_time.h +++ b/src/lib/dcpomatic_time.h @@ -118,10 +118,12 @@ public: * 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 (float r) const { + return Time<S, O> (llrint (HZ * frames_ceil(r) / double(r))); + } + + Time<S, O> floor (float r) const { + return Time<S, O> (llrint (HZ * frames_floor(r) / double(r))); } double seconds () const { @@ -143,7 +145,7 @@ public: template <typename T> int64_t frames_floor (T r) const { - return floor (_t * r / HZ); + return ::floor (_t * r / HZ); } template <typename T> @@ -152,7 +154,7 @@ public: 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 */ @@ -211,7 +213,8 @@ public: } private: - friend struct dcptime_round_up_test; + friend struct dcptime_ceil_test; + friend struct dcptime_floor_test; Type _t; static const int HZ = 96000; |