summaryrefslogtreecommitdiff
path: root/src/lib/video_content.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-12-11 01:06:37 +0000
committerCarl Hetherington <cth@carlh.net>2017-12-11 01:06:37 +0000
commit14c5566fe90b2584c7474c3250e6506d70e81510 (patch)
treea219ac33ceb407eb384e0781b4f4e741f99a374d /src/lib/video_content.cc
parentf09e516b90f0b097c949926831ad1bc282ba41f7 (diff)
Fix various problems caused by non-integer-frame start trims,
and also by the inability of content_video_to_dcp to return negative values. The latter is necessary for tests on "is this content too early" to work.
Diffstat (limited to 'src/lib/video_content.cc')
-rw-r--r--src/lib/video_content.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 92219b4c7..cd96e19bc 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -544,3 +544,9 @@ VideoContent::modify_position (DCPTime& pos) const
{
pos = pos.ceil (_parent->film()->video_frame_rate());
}
+
+void
+VideoContent::modify_trim_start (ContentTime& trim) const
+{
+ trim = trim.ceil (_parent->video_frame_rate().get());
+}