Fix seek through multi-reel DCP imports.

[dcpomatic.git] / src / lib / video_decoder.cc

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index ec5ae8884b730cfc5f02c40f30e03ff3da2add29..f87e4108616ccdc260d70d10f0dacc2a1e5a67d9 100644 (file)
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -90,7 +90,22 @@ VideoDecoder::get (Frame frame, bool accurate)
                _parent->seek (ContentTime::from_frames (frame, _content->active_video_frame_rate()), accurate);
        }
 
-       unsigned int const frames_wanted = _content->video->frame_type() == VIDEO_FRAME_TYPE_2D ? 1 : 2;
+       unsigned int frames_wanted = 0;
+       switch (_content->video->frame_type()) {
+       case VIDEO_FRAME_TYPE_2D:
+       case VIDEO_FRAME_TYPE_3D:
+       case VIDEO_FRAME_TYPE_3D_ALTERNATE:
+       case VIDEO_FRAME_TYPE_3D_LEFT:
+       case VIDEO_FRAME_TYPE_3D_RIGHT:
+               frames_wanted = 1;
+               break;
+       case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT:
+       case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM:
+               frames_wanted = 2;
+               break;
+       default:
+               DCPOMATIC_ASSERT (false);
+       }
 
        list<ContentVideo> dec;
 
@@ -145,7 +160,8 @@ VideoDecoder::get (Frame frame, bool accurate)
        }
 
        /* Clean up _decoded; keep the frame we are returning, if any (which may have two images
-          for 3D), but nothing before that */
+          for 3D), but nothing before that
+       */
        while (!_decoded.empty() && !dec.empty() && _decoded.front().frame.index() < dec.front().frame.index()) {
                _decoded.pop_front ();
        }
@@ -252,7 +268,7 @@ VideoDecoder::give (shared_ptr<const ImageProxy> image, Frame frame)
                /* We receive the same frame index twice for 3D-alternate; hence we know which
                   frame this one is.
                */
-               bool const same = (!_decoded.empty() && frame == _decoded.back().frame);
+               bool const same = (!_decoded.empty() && frame == _decoded.back().frame.index());
                to_push.push_back (ContentVideo (image, VideoFrame (frame, same ? EYES_RIGHT : EYES_LEFT), PART_WHOLE));
                break;
        }
@@ -282,48 +298,65 @@ VideoDecoder::give (shared_ptr<const ImageProxy> image, Frame frame)
        optional<VideoFrame> from;
 
        if (_decoded.empty() && _last_seek_time && _last_seek_accurate) {
-               from = VideoFrame (_last_seek_time->frames_round (_content->active_video_frame_rate ()), EYES_LEFT);
+               from = VideoFrame (
+                       _last_seek_time->frames_round (_content->active_video_frame_rate ()),
+                       _content->video->frame_type() == VIDEO_FRAME_TYPE_2D ? EYES_BOTH : EYES_LEFT
+                       );
        } else if (!_decoded.empty ()) {
+               /* Get the last frame we have */
                from = _decoded.back().frame;
+               /* And move onto the first frame we need */
                ++(*from);
+               if (_content->video->frame_type() == VIDEO_FRAME_TYPE_3D_LEFT || _content->video->frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) {
+                       /* The previous ++ will increment a 3D-left-eye to the same index right-eye.  If we are dealing with
+                          a single-eye source we need an extra ++ to move back to the same eye.
+                       */
+                       ++(*from);
+               }
        }
 
        /* If we've pre-rolled on a seek we may now receive out-of-order frames
           (frames before the last seek time) which we can just ignore.
        */
-
-       if (from && from->index() > to_push.front().frame.index()) {
+       if (from && (*from) > to_push.front().frame) {
                return;
        }
 
-       if (from) {
-               switch (_content->video->frame_type ()) {
-               case VIDEO_FRAME_TYPE_2D:
-                       fill_one_eye (from->index(), to_push.front().frame.index(), EYES_BOTH);
-                       break;
-               case VIDEO_FRAME_TYPE_3D:
-               case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT:
-               case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM:
-               case VIDEO_FRAME_TYPE_3D_ALTERNATE:
-                       fill_both_eyes (from.get(), to_push.front().frame);
-                       break;
-               case VIDEO_FRAME_TYPE_3D_LEFT:
-                       fill_one_eye (from->index(), to_push.front().frame.index(), EYES_LEFT);
-                       break;
-               case VIDEO_FRAME_TYPE_3D_RIGHT:
-                       fill_one_eye (from->index(), to_push.front().frame.index(), EYES_RIGHT);
-                       break;
+       int const max_decoded_size = 96;
+
+       /* If _decoded is already `full' there is no point in adding anything more to it,
+          as the new stuff will just be removed again.
+       */
+       if (_decoded.size() < max_decoded_size) {
+               if (from) {
+                       switch (_content->video->frame_type ()) {
+                       case VIDEO_FRAME_TYPE_2D:
+                               fill_one_eye (from->index(), to_push.front().frame.index(), EYES_BOTH);
+                               break;
+                       case VIDEO_FRAME_TYPE_3D:
+                       case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT:
+                       case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM:
+                       case VIDEO_FRAME_TYPE_3D_ALTERNATE:
+                               fill_both_eyes (from.get(), to_push.front().frame);
+                               break;
+                       case VIDEO_FRAME_TYPE_3D_LEFT:
+                               fill_one_eye (from->index(), to_push.front().frame.index(), EYES_LEFT);
+                               break;
+                       case VIDEO_FRAME_TYPE_3D_RIGHT:
+                               fill_one_eye (from->index(), to_push.front().frame.index(), EYES_RIGHT);
+                               break;
+                       }
                }
-       }
 
-       copy (to_push.begin(), to_push.end(), back_inserter (_decoded));
+               copy (to_push.begin(), to_push.end(), back_inserter (_decoded));
+       }
 
        /* We can't let this build up too much or we will run out of memory.  There is a
           `best' value for the allowed size of _decoded which balances memory use
           with decoding efficiency (lack of seeks).  Throwing away video frames here
           is not a problem for correctness, so do it.
        */
-       while (_decoded.size() > 96) {
+       while (_decoded.size() > max_decoded_size) {
                _decoded.pop_back ();
        }
 }