X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_mxf_decoder.cc;h=d2b057972ef8209ca27532fb10af3e46607f104b;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=7d9656dd5a7d755aabf1379c42212cb33c1f2326;hpb=254b3044d72de6b033d7c584f5abd2b9aa70aad5;p=dcpomatic.git

diff --git a/src/lib/video_mxf_decoder.cc b/src/lib/video_mxf_decoder.cc
index 7d9656dd5..d2b057972 100644
--- a/src/lib/video_mxf_decoder.cc
+++ b/src/lib/video_mxf_decoder.cc
@@ -22,17 +22,20 @@
 #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)
-	: _content (content)
+VideoMXFDecoder::VideoMXFDecoder (shared_ptr<const Film> film, shared_ptr<const VideoMXFContent> content)
+	: Decoder (film)
+	, _content (content)
 {
 	video.reset (new VideoDecoder (this, content));
 
@@ -41,7 +44,7 @@ VideoMXFDecoder::VideoMXFDecoder (shared_ptr<const VideoMXFContent> content)
 		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 */
 	}
 
@@ -52,7 +55,7 @@ VideoMXFDecoder::VideoMXFDecoder (shared_ptr<const VideoMXFContent> content)
 		if (!mono) {
 			throw;
 		}
-	} catch (dcp::DCPReadError& e) {
+	} catch (dcp::ReadError& e) {
 		if (!mono) {
 			throw;
 		}
@@ -68,9 +71,9 @@ VideoMXFDecoder::VideoMXFDecoder (shared_ptr<const VideoMXFContent> content)
 }
 
 bool
-VideoMXFDecoder::pass (shared_ptr<const Film> film)
+VideoMXFDecoder::pass ()
 {
-	double const vfr = _content->active_video_frame_rate (film);
+	double const vfr = _content->active_video_frame_rate (film());
 	int64_t const frame = _next.frames_round (vfr);
 
 	if (frame >= _content->video->length()) {
@@ -79,7 +82,7 @@ VideoMXFDecoder::pass (shared_ptr<const Film> film)
 
 	if (_mono_reader) {
 		video->emit (
-			film,
+			film(),
 			shared_ptr<ImageProxy> (
 				new J2KImageProxy (_mono_reader->get_frame(frame), _size, AV_PIX_FMT_XYZ12LE, optional<int>())
 				),
@@ -87,14 +90,14 @@ VideoMXFDecoder::pass (shared_ptr<const Film> film)
 			);
 	} else {
 		video->emit (
-			film,
+			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,
+			film(),
 			shared_ptr<ImageProxy> (
 				new J2KImageProxy (_stereo_reader->get_frame(frame), _size, dcp::EYE_RIGHT, AV_PIX_FMT_XYZ12LE, optional<int>())
 				),
@@ -107,8 +110,8 @@ VideoMXFDecoder::pass (shared_ptr<const Film> film)
 }
 
 void
-VideoMXFDecoder::seek (shared_ptr<const Film> film, ContentTime t, bool accurate)
+VideoMXFDecoder::seek (ContentTime t, bool accurate)
 {
-	Decoder::seek (film, t, accurate);
+	Decoder::seek (t, accurate);
 	_next = t;
 }