Another macOS std::list boost::thread SNAFU.

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

diff --git a/src/lib/video_mxf_decoder.cc b/src/lib/video_mxf_decoder.cc
index 24f5c31eaee228b59e3fb857f59b66373b1600a1..4482606f030b08bc98d4db0309b175d0f5e2b5c4 100644 (file)
--- a/src/lib/video_mxf_decoder.cc
+++ b/src/lib/video_mxf_decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2017 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -22,20 +22,22 @@
 #include "video_decoder.h"
 #include "video_mxf_content.h"
 #include "j2k_image_proxy.h"
+#include "frame_interval_checker.h"
 #include <dcp/mono_picture_asset.h>
 #include <dcp/mono_picture_asset_reader.h>
 #include <dcp/stereo_picture_asset.h>
 #include <dcp/stereo_picture_asset_reader.h>
 #include <dcp/exceptions.h>
-#include <boost/make_shared.hpp>
 
 using boost::shared_ptr;
-using boost::make_shared;
+using boost::optional;
+using namespace dcpomatic;
 
-VideoMXFDecoder::VideoMXFDecoder (shared_ptr<const VideoMXFContent> content, shared_ptr<Log> log)
-       : _content (content)
+VideoMXFDecoder::VideoMXFDecoder (shared_ptr<const Film> film, shared_ptr<const VideoMXFContent> content)
+       : Decoder (film)
+       , _content (content)
 {
-       video.reset (new VideoDecoder (this, content, log));
+       video.reset (new VideoDecoder (this, content));
 
        shared_ptr<dcp::MonoPictureAsset> mono;
        try {
@@ -69,20 +71,39 @@ VideoMXFDecoder::VideoMXFDecoder (shared_ptr<const VideoMXFContent> content, sha
 }
 
 bool
-VideoMXFDecoder::pass (PassReason, bool)
+VideoMXFDecoder::pass ()
 {
-       double const vfr = _content->active_video_frame_rate ();
+       double const vfr = _content->active_video_frame_rate (film());
        int64_t const frame = _next.frames_round (vfr);
 
+
        if (frame >= _content->video->length()) {
                return true;
        }
 
        if (_mono_reader) {
-               video->give (make_shared<J2KImageProxy> (_mono_reader->get_frame(frame), _size), frame);
+               video->emit (
+                       film(),
+                       shared_ptr<ImageProxy> (
+                               new J2KImageProxy (_mono_reader->get_frame(frame), _size, AV_PIX_FMT_XYZ12LE, optional<int>())
+                               ),
+                       frame
+                       );
        } else {
-               video->give (make_shared<J2KImageProxy> (_stereo_reader->get_frame(frame), _size, dcp::EYE_LEFT), frame);
-               video->give (make_shared<J2KImageProxy> (_stereo_reader->get_frame(frame), _size, dcp::EYE_RIGHT), frame);
+               video->emit (
+                       film(),
+                       shared_ptr<ImageProxy> (
+                               new J2KImageProxy (_stereo_reader->get_frame(frame), _size, dcp::EYE_LEFT, AV_PIX_FMT_XYZ12LE, optional<int>())
+                               ),
+                       frame
+                       );
+               video->emit (
+                       film(),
+                       shared_ptr<ImageProxy> (
+                               new J2KImageProxy (_stereo_reader->get_frame(frame), _size, dcp::EYE_RIGHT, AV_PIX_FMT_XYZ12LE, optional<int>())
+                               ),
+                       frame
+                       );
        }
 
        _next += ContentTime::from_frames (1, vfr);
@@ -92,6 +113,6 @@ VideoMXFDecoder::pass (PassReason, bool)
 void
 VideoMXFDecoder::seek (ContentTime t, bool accurate)
 {
-       video->seek (t, accurate);
+       Decoder::seek (t, accurate);
        _next = t;
 }