X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_mxf_decoder.cc;h=1bf2b1bef87737957f55dc92f873b4d761b82b5e;hb=95ddf2cc72b800967b9917f75917cfdde325d2e5;hp=194830c635e4ec5cab4495c99fb2e6790d38515f;hpb=0253b4e45c71a1c2e2a8bffaf1c3cb84a0a3e41a;p=dcpomatic.git

diff --git a/src/lib/video_mxf_decoder.cc b/src/lib/video_mxf_decoder.cc
index 194830c63..1bf2b1bef 100644
--- a/src/lib/video_mxf_decoder.cc
+++ b/src/lib/video_mxf_decoder.cc
@@ -30,11 +30,13 @@
 
 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 {
@@ -70,15 +72,17 @@ VideoMXFDecoder::VideoMXFDecoder (shared_ptr<const VideoMXFContent> content, sha
 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->emit (
+			film(),
 			shared_ptr<ImageProxy> (
 				new J2KImageProxy (_mono_reader->get_frame(frame), _size, AV_PIX_FMT_XYZ12LE, optional<int>())
 				),
@@ -86,12 +90,14 @@ VideoMXFDecoder::pass ()
 			);
 	} else {
 		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->emit (
+			film(),
 			shared_ptr<ImageProxy> (
 				new J2KImageProxy (_stereo_reader->get_frame(frame), _size, dcp::EYE_RIGHT, AV_PIX_FMT_XYZ12LE, optional<int>())
 				),