X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_decoder.cc;h=e1106f86d08f616455aa2323180d80212c4f6b3c;hb=62f9b78a2eb5f0fc6b9028264bac6ad501d83309;hp=5a637f4df98d4be1bbe4da7c2753adfcc7a4bfb6;hpb=eb135e8dcdf36ae82420bcd18e954ad593b3e9a5;p=dcpomatic.git

diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc
index 5a637f4df..e1106f86d 100644
--- a/src/lib/image_decoder.cc
+++ b/src/lib/image_decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,32 +18,38 @@
 
 */
 
+
 #include "image_content.h"
 #include "image_decoder.h"
 #include "video_decoder.h"
 #include "image.h"
-#include "magick_image_proxy.h"
+#include "ffmpeg_image_proxy.h"
 #include "j2k_image_proxy.h"
 #include "film.h"
 #include "exceptions.h"
 #include "video_content.h"
-#include <Magick++.h>
+#include "frame_interval_checker.h"
 #include <boost/filesystem.hpp>
 #include <iostream>
 
 #include "i18n.h"
 
+
 using std::cout;
-using boost::shared_ptr;
+using std::make_shared;
+using std::shared_ptr;
 using dcp::Size;
+using namespace dcpomatic;
+
 
-ImageDecoder::ImageDecoder (shared_ptr<const ImageContent> c, shared_ptr<Log> log)
-	: _image_content (c)
-	, _frame_video_position (0)
+ImageDecoder::ImageDecoder (shared_ptr<const Film> film, shared_ptr<const ImageContent> c)
+	: Decoder (film)
+	, _image_content (c)
 {
-	video.reset (new VideoDecoder (this, c, log));
+	video = make_shared<VideoDecoder>(this, c);
 }
 
+
 bool
 ImageDecoder::pass ()
 {
@@ -53,7 +59,7 @@ ImageDecoder::pass ()
 
 	if (!_image_content->still() || !_image) {
 		/* Either we need an image or we are using moving images, so load one */
-		boost::filesystem::path path = _image_content->path (_image_content->still() ? 0 : _frame_video_position);
+		auto path = _image_content->path (_image_content->still() ? 0 : _frame_video_position);
 		if (valid_j2k_file (path)) {
 			AVPixelFormat pf;
 			if (_image_content->video->colour_conversion()) {
@@ -66,19 +72,21 @@ ImageDecoder::pass ()
 			/* We can't extract image size from a JPEG2000 codestream without decoding it,
 			   so pass in the image content's size here.
 			*/
-			_image.reset (new J2KImageProxy (path, _image_content->video->size(), pf));
+			_image = make_shared<J2KImageProxy>(path, _image_content->video->size(), pf);
 		} else {
-			_image.reset (new MagickImageProxy (path));
+			_image = make_shared<FFmpegImageProxy>(path);
 		}
 	}
 
-	video->emit (_image, _frame_video_position);
+	video->emit (film(), _image, _frame_video_position);
 	++_frame_video_position;
 	return false;
 }
 
+
 void
-ImageDecoder::seek (ContentTime time, bool)
+ImageDecoder::seek (ContentTime time, bool accurate)
 {
-	_frame_video_position = time.frames_round (_image_content->active_video_frame_rate ());
+	Decoder::seek (time, accurate);
+	_frame_video_position = time.frames_round (_image_content->active_video_frame_rate(film()));
 }