X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_mxf_decoder.cc;h=6e194a6dfe5488c00f134b4b388479ff9518356e;hb=28111007e2e6fd62f5810be780706ae1618bd33f;hp=37ffafa71cd742284f5ef0336cbe763d8f0a30a2;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/lib/video_mxf_decoder.cc b/src/lib/video_mxf_decoder.cc
index 37ffafa71..6e194a6df 100644
--- 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,27 +22,29 @@
 #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>
 
-using boost::shared_ptr;
+using std::shared_ptr;
+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));
 
-bool
-VideoMXFDecoder::pass (PassReason reason, bool)
-{
 	shared_ptr<dcp::MonoPictureAsset> mono;
 	try {
 		mono.reset (new dcp::MonoPictureAsset (_content->path(0)));
 	} catch (dcp::MXFFileError& e) {
 		/* maybe it's stereo */
-	} catch (dcp::DCPReadError& e) {
+	} catch (dcp::ReadError& e) {
 		/* maybe it's stereo */
 	}
 
@@ -53,28 +55,63 @@ VideoMXFDecoder::pass (PassReason reason, bool)
 		if (!mono) {
 			throw;
 		}
-	} catch (dcp::DCPReadError& e) {
+	} catch (dcp::ReadError& e) {
 		if (!mono) {
 			throw;
 		}
 	}
 
-	double const vfr = _content->active_video_frame_rate ();
+	if (mono) {
+		_mono_reader = mono->start_read ();
+		_size = mono->size ();
+	} else {
+		_stereo_reader = stereo->start_read ();
+		_size = stereo->size ();
+	}
+}
+
+bool
+VideoMXFDecoder::pass ()
+{
+	double const vfr = _content->active_video_frame_rate (film());
 	int64_t const frame = _next.frames_round (vfr);
 
-	if (mono) {
-		video->give (shared_ptr<ImageProxy> (new J2KImageProxy (mono->get_frame(frame), mono->size())), frame);
+	if (frame >= _content->video->length()) {
+		return true;
+	}
+
+	if (_mono_reader) {
+		video->emit (
+			film(),
+			shared_ptr<ImageProxy> (
+				new J2KImageProxy (_mono_reader->get_frame(frame), _size, AV_PIX_FMT_XYZ12LE, optional<int>())
+				),
+			frame
+			);
 	} else {
-		video->give (shared_ptr<ImageProxy> (new J2KImageProxy (stereo->get_frame(frame), stereo->size(), dcp::EYE_LEFT)), frame);
-		video->give (shared_ptr<ImageProxy> (new J2KImageProxy (stereo->get_frame(frame), stereo->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);
+	return false;
 }
 
 void
 VideoMXFDecoder::seek (ContentTime t, bool accurate)
 {
-	video->seek (t, accurate);
+	Decoder::seek (t, accurate);
 	_next = t;
 }