Try to fix some warnings.

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

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index 9afbd31c46bbd4d52304b478c054fee62fa2e97d..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,13 +53,12 @@ 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;
        }
 
-       /* Work out what we are going to emit next */
        switch (_content->video->frame_type ()) {
        case VIDEO_FRAME_TYPE_2D:
                Data (ContentVideo (image, frame, EYES_BOTH, PART_WHOLE));
@@ -76,6 +75,7 @@ VideoDecoder::emit (shared_ptr<const ImageProxy> image, Frame frame)
        }
        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));
@@ -95,5 +95,12 @@ VideoDecoder::emit (shared_ptr<const ImageProxy> image, Frame frame)
                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 ();
 }