X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_mxf_decoder.cc;h=194830c635e4ec5cab4495c99fb2e6790d38515f;hb=c75484af73d38b00a4f27143f8e434b6f25bf355;hp=70c884699fe523b81fdbe568adc85402ca22539a;hpb=761b1587bab3870584833e4299156dfea6d70f63;p=dcpomatic.git

diff --git a/src/lib/video_mxf_decoder.cc b/src/lib/video_mxf_decoder.cc
index 70c884699..194830c63 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.
 
@@ -23,26 +23,18 @@
 #include "video_mxf_content.h"
 #include "j2k_image_proxy.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 boost::optional;
 
 VideoMXFDecoder::VideoMXFDecoder (shared_ptr<const VideoMXFContent> content, shared_ptr<Log> log)
 	: _content (content)
 {
 	video.reset (new VideoDecoder (this, content, log));
-}
-
-bool
-VideoMXFDecoder::pass (PassReason, bool)
-{
-	double const vfr = _content->active_video_frame_rate ();
-	int64_t const frame = _next.frames_round (vfr);
-
-	if (frame >= _content->video->length()) {
-		return true;
-	}
 
 	shared_ptr<dcp::MonoPictureAsset> mono;
 	try {
@@ -67,10 +59,44 @@ VideoMXFDecoder::pass (PassReason, bool)
 	}
 
 	if (mono) {
-		video->give (shared_ptr<ImageProxy> (new J2KImageProxy (mono->get_frame(frame), mono->size())), frame);
+		_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 ();
+	int64_t const frame = _next.frames_round (vfr);
+
+	if (frame >= _content->video->length()) {
+		return true;
+	}
+
+	if (_mono_reader) {
+		video->emit (
+			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 (
+			shared_ptr<ImageProxy> (
+				new J2KImageProxy (_stereo_reader->get_frame(frame), _size, dcp::EYE_LEFT, AV_PIX_FMT_XYZ12LE, optional<int>())
+				),
+			frame
+			);
+		video->emit (
+			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);
@@ -80,6 +106,6 @@ VideoMXFDecoder::pass (PassReason, bool)
 void
 VideoMXFDecoder::seek (ContentTime t, bool accurate)
 {
-	video->seek (t, accurate);
+	Decoder::seek (t, accurate);
 	_next = t;
 }