projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Discard audio that comes out of FFmpeg files before time 0.
[dcpomatic.git]
/
src
/
lib
/
dcpomatic_time.h
diff --git
a/src/lib/dcpomatic_time.h
b/src/lib/dcpomatic_time.h
index 494aebba73c32583d902608a55d5184a9523af1c..7d755a46cf1a7e53a826f3f7ddd1f596b35ccc81 100644
(file)
--- a/
src/lib/dcpomatic_time.h
+++ b/
src/lib/dcpomatic_time.h
@@
-30,7
+30,6
@@
#include <stdint.h>
#include <cmath>
#include <ostream>
#include <stdint.h>
#include <cmath>
#include <ostream>
-#include <sstream>
#include <iomanip>
class dcpomatic_round_up_test;
#include <iomanip>
class dcpomatic_round_up_test;
@@
-117,8
+116,8
@@
public:
* at some sampling rate.
* @param r Sampling rate.
*/
* 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));
}
Type const a = _t + n - 1;
return Time<S, O> (a - (a % n));
}
@@
-132,7
+131,12
@@
public:
}
template <typename T>
}
template <typename T>
- int64_t frames (T r) const {
+ 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);
}
return floor (_t * r / HZ);
}
@@
-143,7
+147,7
@@
public:
/* Do this calculation with frames so that we can round
to a frame boundary at the start rather than the end.
*/
/* 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;
h = ff / (3600 * r);
ff -= h * 3600 * r;
@@
-175,7
+179,7
@@
public:
static Time<S, O> from_seconds (double s) {
static Time<S, O> from_seconds (double s) {
- return Time<S, O> (rint (s * HZ));
+ return Time<S, O> (
ll
rint (s * HZ));
}
template <class T>
}
template <class T>
@@
-238,6
+242,10
@@
public:
bool overlaps (ContentTimePeriod const & o) const;
bool contains (ContentTime const & o) const;
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 min (DCPTime a, DCPTime b);