X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_mxf_decoder.cc;h=4482606f030b08bc98d4db0309b175d0f5e2b5c4;hb=351942d335db261ac6fe54f2f8a3f439fef22d47;hp=dc4f8d60b6882b23b255240cc4e23359bd2dcfbc;hpb=92c691f29c5da9abca6a06605998e09f9b8103bb;p=dcpomatic.git

diff --git a/src/lib/video_mxf_decoder.cc b/src/lib/video_mxf_decoder.cc
index dc4f8d60b..4482606f0 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,6 +22,7 @@
 #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>
@@ -29,11 +30,14 @@
 #include <dcp/exceptions.h>
 
 using boost::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));
 
 	shared_ptr<dcp::MonoPictureAsset> mono;
 	try {
@@ -67,25 +71,38 @@ 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 (
-			shared_ptr<ImageProxy> (new J2KImageProxy (_mono_reader->get_frame(frame), _size, AV_PIX_FMT_XYZ12LE)), 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 (
-			shared_ptr<ImageProxy> (new J2KImageProxy (_stereo_reader->get_frame(frame), _size, dcp::EYE_LEFT, AV_PIX_FMT_XYZ12LE)), 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->give (
-			shared_ptr<ImageProxy> (new J2KImageProxy (_stereo_reader->get_frame(frame), _size, dcp::EYE_RIGHT, AV_PIX_FMT_XYZ12LE)), 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
 			);
 	}
 
@@ -96,6 +113,6 @@ VideoMXFDecoder::pass (PassReason, bool)
 void
 VideoMXFDecoder::seek (ContentTime t, bool accurate)
 {
-	video->seek (t, accurate);
+	Decoder::seek (t, accurate);
 	_next = t;
 }