Only mark _suspended as false at the appropriate times; previously

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

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index 2bd8d6f5170e0c0e824af35b1d236e674538efe6..813320eb86f89ecd5518a315df121a9011500411 100644 (file)
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -36,8 +36,8 @@ using std::back_inserter;
 using boost::shared_ptr;
 using boost::optional;
 
-VideoDecoder::VideoDecoder (Decoder* parent, shared_ptr<const Content> c, shared_ptr<Log> log)
-       : DecoderPart (parent, log)
+VideoDecoder::VideoDecoder (Decoder* parent, shared_ptr<const Content> c)
+       : DecoderPart (parent)
        , _content (c)
 {
 
@@ -53,52 +53,54 @@ VideoDecoder::VideoDecoder (Decoder* parent, shared_ptr<const Content> c, shared
  *  and so on.
  */
 void
-VideoDecoder::emit (shared_ptr<const ImageProxy> image, Frame frame)
+VideoDecoder::emit (shared_ptr<const Film> film, shared_ptr<const ImageProxy> image, Frame frame)
 {
        if (ignore ()) {
                return;
        }
 
-       FrameRateChange const frc = _content->film()->active_frame_rate_change (_content->position());
-       for (int i = 0; i < frc.repeat; ++i) {
-               switch (_content->video->frame_type ()) {
-               case VIDEO_FRAME_TYPE_2D:
-                       Data (ContentVideo (image, frame, EYES_BOTH, PART_WHOLE));
-                       break;
-               case VIDEO_FRAME_TYPE_3D:
-               {
-                       /* We receive the same frame index twice for 3D; hence we know which
-                          frame this one is.
-                       */
-                       bool const same = (_last_emitted && _last_emitted.get() == frame);
-                       Data (ContentVideo (image, frame, same ? EYES_RIGHT : EYES_LEFT, PART_WHOLE));
-                       _last_emitted = frame;
-                       break;
-               }
-               case VIDEO_FRAME_TYPE_3D_ALTERNATE:
-                       Data (ContentVideo (image, frame / 2, (frame % 2) ? EYES_RIGHT : EYES_LEFT, PART_WHOLE));
-                       frame /= 2;
-                       break;
-               case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT:
-                       Data (ContentVideo (image, frame, EYES_LEFT, PART_LEFT_HALF));
-                       Data (ContentVideo (image, frame, EYES_RIGHT, PART_RIGHT_HALF));
-                       break;
-               case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM:
-                       Data (ContentVideo (image, frame, EYES_LEFT, PART_TOP_HALF));
-                       Data (ContentVideo (image, frame, EYES_RIGHT, PART_BOTTOM_HALF));
-                       break;
-               case VIDEO_FRAME_TYPE_3D_LEFT:
-                       Data (ContentVideo (image, frame, EYES_LEFT, PART_WHOLE));
-                       break;
-               case VIDEO_FRAME_TYPE_3D_RIGHT:
-                       Data (ContentVideo (image, frame, EYES_RIGHT, PART_WHOLE));
-                       break;
-               default:
-                       DCPOMATIC_ASSERT (false);
-               }
-
-               ++frame;
+       switch (_content->video->frame_type ()) {
+       case VIDEO_FRAME_TYPE_2D:
+               Data (ContentVideo (image, frame, EYES_BOTH, PART_WHOLE));
+               break;
+       case VIDEO_FRAME_TYPE_3D:
+       {
+               /* We receive the same frame index twice for 3D; hence we know which
+                  frame this one is.
+               */
+               bool const same = (_last_emitted && _last_emitted.get() == frame);
+               Data (ContentVideo (image, frame, same ? EYES_RIGHT : EYES_LEFT, PART_WHOLE));
+               _last_emitted = frame;
+               break;
+       }
+       case VIDEO_FRAME_TYPE_3D_ALTERNATE:
+               Data (ContentVideo (image, frame / 2, (frame % 2) ? EYES_RIGHT : EYES_LEFT, PART_WHOLE));
+               frame /= 2;
+               break;
+       case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT:
+               Data (ContentVideo (image, frame, EYES_LEFT, PART_LEFT_HALF));
+               Data (ContentVideo (image, frame, EYES_RIGHT, PART_RIGHT_HALF));
+               break;
+       case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM:
+               Data (ContentVideo (image, frame, EYES_LEFT, PART_TOP_HALF));
+               Data (ContentVideo (image, frame, EYES_RIGHT, PART_BOTTOM_HALF));
+               break;
+       case VIDEO_FRAME_TYPE_3D_LEFT:
+               Data (ContentVideo (image, frame, EYES_LEFT, PART_WHOLE));
+               break;
+       case VIDEO_FRAME_TYPE_3D_RIGHT:
+               Data (ContentVideo (image, frame, EYES_RIGHT, PART_WHOLE));
+               break;
+       default:
+               DCPOMATIC_ASSERT (false);
        }
 
-       _position = ContentTime::from_frames (frame, _content->active_video_frame_rate ());
+       _position = ContentTime::from_frames (frame, _content->active_video_frame_rate(film));
+}
+
+void
+VideoDecoder::seek ()
+{
+       _position = ContentTime();
+       _last_emitted.reset ();
 }