X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fvideo_mxf_decoder.cc;h=92cab0259dd8a1697826f2ad5213b221cba7e6e3;hp=216721375fac0f832bf06c17dc5c117f890e50d1;hb=a498b8819ab431ecc2aac058b1aadb9e15d396ac;hpb=89aa9d4ba69e471949f791cdafe4ae20cea554d2

diff --git a/src/lib/video_mxf_decoder.cc b/src/lib/video_mxf_decoder.cc
index 216721375..92cab0259 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-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,40 +18,48 @@
 
 */
 
+
 #include "video_mxf_decoder.h"
 #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;
 
-VideoMXFDecoder::VideoMXFDecoder (shared_ptr<const VideoMXFContent> content, shared_ptr<Log> log)
-	: _content (content)
+using std::make_shared;
+using std::shared_ptr;
+using boost::optional;
+using namespace dcpomatic;
+
+
+VideoMXFDecoder::VideoMXFDecoder (shared_ptr<const Film> film, shared_ptr<const VideoMXFContent> content)
+	: Decoder (film)
+	, _content (content)
 {
-	video.reset (new VideoDecoder (this, content, log));
+	video = make_shared<VideoDecoder>(this, content);
 
 	shared_ptr<dcp::MonoPictureAsset> mono;
 	try {
-		mono.reset (new dcp::MonoPictureAsset (_content->path(0)));
+		mono = make_shared<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 */
 	}
 
 	shared_ptr<dcp::StereoPictureAsset> stereo;
 	try {
-		stereo.reset (new dcp::StereoPictureAsset (_content->path(0)));
+		stereo = make_shared<dcp::StereoPictureAsset>(_content->path(0));
 	} catch (dcp::MXFFileError& e) {
 		if (!mono) {
 			throw;
 		}
-	} catch (dcp::DCPReadError& e) {
+	} catch (dcp::ReadError& e) {
 		if (!mono) {
 			throw;
 		}
@@ -59,18 +67,21 @@ VideoMXFDecoder::VideoMXFDecoder (shared_ptr<const VideoMXFContent> content, sha
 
 	if (mono) {
 		_mono_reader = mono->start_read ();
+		_mono_reader->set_check_hmac (false);
 		_size = mono->size ();
 	} else {
 		_stereo_reader = stereo->start_read ();
+		_stereo_reader->set_check_hmac (false);
 		_size = stereo->size ();
 	}
 }
 
+
 bool
 VideoMXFDecoder::pass ()
 {
-	double const vfr = _content->active_video_frame_rate ();
-	int64_t const frame = _next.frames_round (vfr);
+	auto const vfr = _content->active_video_frame_rate (film());
+	auto const frame = _next.frames_round (vfr);
 
 	if (frame >= _content->video->length()) {
 		return true;
@@ -78,14 +89,20 @@ VideoMXFDecoder::pass ()
 
 	if (_mono_reader) {
 		video->emit (
-			shared_ptr<ImageProxy> (new J2KImageProxy (_mono_reader->get_frame(frame), _size, AV_PIX_FMT_XYZ12LE)), frame
+			film(),
+			std::make_shared<J2KImageProxy>(_mono_reader->get_frame(frame), _size, AV_PIX_FMT_XYZ12LE, optional<int>()),
+			frame
 			);
 	} else {
 		video->emit (
-			shared_ptr<ImageProxy> (new J2KImageProxy (_stereo_reader->get_frame(frame), _size, dcp::EYE_LEFT, AV_PIX_FMT_XYZ12LE)), frame
+			film(),
+			std::make_shared<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)), frame
+			film(),
+			std::make_shared<J2KImageProxy>(_stereo_reader->get_frame(frame), _size, dcp::Eye::RIGHT, AV_PIX_FMT_XYZ12LE, optional<int>()),
+			frame
 			);
 	}
 
@@ -93,6 +110,7 @@ VideoMXFDecoder::pass ()
 	return false;
 }
 
+
 void
 VideoMXFDecoder::seek (ContentTime t, bool accurate)
 {