Always pre-roll when seeking in DCPs; I don't think the performance

hit is anything to worry about (especially compared to the time taken
to decode the next frame).

diff --git a/ChangeLog b/ChangeLog
index 65bdf5eeb6ff72378b9e89edb3cf86d093b33f7c..faba489d4327654300db3259f4c996108325325b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2018-02-09  Carl Hetherington  <cth@carlh.net>
 
+       * Always pre-roll when seeking in DCPs (#1085).
+
        * Version 2.11.52 released.
 
 2018-02-09  Carl Hetherington  <cth@carlh.net>

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index c1c7780bb8c782346bb87474d421b0eb42fc1b2d..2ffe110655d8f676217f6ee6af38d0fab0b95d5a 100644 (file)
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -259,30 +259,28 @@ DCPDecoder::seek (ContentTime t, bool accurate)
        _offset = 0;
        get_readers ();
 
-       if (accurate) {
-               int const pre_roll_seconds = 2;
+       int const pre_roll_seconds = 2;
 
-               /* Pre-roll for subs */
+       /* Pre-roll for subs */
 
-               ContentTime pre = t - ContentTime::from_seconds (pre_roll_seconds);
-               if (pre < ContentTime()) {
-                       pre = ContentTime ();
-               }
+       ContentTime pre = t - ContentTime::from_seconds (pre_roll_seconds);
+       if (pre < ContentTime()) {
+               pre = ContentTime ();
+       }
 
-               /* Seek to pre-roll position */
+       /* Seek to pre-roll position */
 
-               while (_reel != _reels.end() && pre >= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate ())) {
-                       pre -= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate ());
-                       next_reel ();
-               }
+       while (_reel != _reels.end() && pre >= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate ())) {
+               pre -= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate ());
+               next_reel ();
+       }
 
-               /* Pass subtitles in the pre-roll */
+       /* Pass subtitles in the pre-roll */
 
-               double const vfr = _dcp_content->active_video_frame_rate ();
-               for (int i = 0; i < pre_roll_seconds * vfr; ++i) {
-                       pass_subtitles (pre);
-                       pre += ContentTime::from_frames (1, vfr);
-               }
+       double const vfr = _dcp_content->active_video_frame_rate ();
+       for (int i = 0; i < pre_roll_seconds * vfr; ++i) {
+               pass_subtitles (pre);
+               pre += ContentTime::from_frames (1, vfr);
        }
 
        /* Seek to correct position */