Somewhat hackily fix rounding of reel lengths.

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 4a26ded3d748968c9ebd4029043a31c37077678e..3cf46220ecde40a0d7b259351edfddf29964636d 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -1292,7 +1292,7 @@ list<DCPTimePeriod>
 Film::reels () const
 {
        list<DCPTimePeriod> p;
-       DCPTime const len = length ();
+       DCPTime const len = length().round_up (video_frame_rate ());
 
        switch (reel_type ()) {
        case REELTYPE_SINGLE:

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index a9b28631504a98e2ec82058cf18dab65b62c7fc1..1e8b9034a6242463a60389458e810a23df334eb9 100644 (file)
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -584,6 +584,9 @@ list<DCPTime>
 VideoContent::reel_split_points () const
 {
        list<DCPTime> t;
-       t.push_back (position ());
+       shared_ptr<const Film> film = _film.lock ();
+       DCPOMATIC_ASSERT (film);
+       /* XXX: this is questionable; perhaps the position should be forced to be on a frame boundary */
+       t.push_back (position().round_up (film->video_frame_rate()));
        return t;
 }