X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_mxf_decoder.cc;h=194830c635e4ec5cab4495c99fb2e6790d38515f;hb=72b11d5eb036651b6ff68edf3ed270e8fc52960f;hp=938d7deaf5c540668e0316b3a45cb99bf5b31501;hpb=368832f2ff6837d9029020b41fb97fb148c3be31;p=dcpomatic.git

diff --git a/src/lib/video_mxf_decoder.cc b/src/lib/video_mxf_decoder.cc
index 938d7deaf..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.
 
@@ -29,6 +29,7 @@
 #include <dcp/exceptions.h>
 
 using boost::shared_ptr;
+using boost::optional;
 
 VideoMXFDecoder::VideoMXFDecoder (shared_ptr<const VideoMXFContent> content, shared_ptr<Log> log)
 	: _content (content)
@@ -67,7 +68,7 @@ VideoMXFDecoder::VideoMXFDecoder (shared_ptr<const VideoMXFContent> content, sha
 }
 
 bool
-VideoMXFDecoder::pass (PassReason, bool)
+VideoMXFDecoder::pass ()
 {
 	double const vfr = _content->active_video_frame_rate ();
 	int64_t const frame = _next.frames_round (vfr);
@@ -77,10 +78,25 @@ VideoMXFDecoder::pass (PassReason, bool)
 	}
 
 	if (_mono_reader) {
-		video->give (shared_ptr<ImageProxy> (new J2KImageProxy (_mono_reader->get_frame(frame), _size)), frame);
+		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_reader->get_frame(frame), _size, dcp::EYE_LEFT)), frame);
-		video->give (shared_ptr<ImageProxy> (new J2KImageProxy (_stereo_reader->get_frame(frame), _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);
@@ -90,6 +106,6 @@ VideoMXFDecoder::pass (PassReason, bool)
 void
 VideoMXFDecoder::seek (ContentTime t, bool accurate)
 {
-	video->seek (t, accurate);
+	Decoder::seek (t, accurate);
 	_next = t;
 }