X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_decoder.cc;h=ecbbd5134adc7298ed2c48717151af4b25c0e66e;hb=0303a96b66eaf85060ce02d85cc36067f34b1051;hp=d0973f1227afdf51dbbc495f0d55651337b3a639;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc
index d0973f122..ecbbd5134 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,60 +18,75 @@
 
 */
 
+
+#include "exceptions.h"
+#include "ffmpeg_image_proxy.h"
+#include "film.h"
+#include "frame_interval_checker.h"
+#include "image.h"
 #include "image_content.h"
 #include "image_decoder.h"
-#include "video_decoder.h"
-#include "image.h"
-#include "magick_image_proxy.h"
 #include "j2k_image_proxy.h"
-#include "film.h"
-#include "exceptions.h"
 #include "video_content.h"
-#include <Magick++.h>
+#include "video_decoder.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)
-	, _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 (PassReason, bool)
+ImageDecoder::pass ()
 {
-	if (_video_position >= _image_content->video->length()) {
+	if (_frame_video_position >= _image_content->video->length()) {
 		return true;
 	}
 
 	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 : _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()) {
+				/* We have a specified colour conversion: assume the image is RGB */
+				pf = AV_PIX_FMT_RGB48LE;
+			} else {
+				/* No specified colour conversion: assume the image is XYZ */
+				pf = AV_PIX_FMT_XYZ12LE;
+			}
 			/* 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 ()));
+			_image = make_shared<J2KImageProxy>(path, _image_content->video->size(), pf);
 		} else {
-			_image.reset (new MagickImageProxy (path));
+			_image = make_shared<FFmpegImageProxy>(path);
 		}
 	}
 
-	video->give (_image, _video_position);
-	++_video_position;
+	video->emit(film(), _image, dcpomatic::ContentTime::from_frames(_frame_video_position, _image_content->video_frame_rate().get_value_or(24)));
+	++_frame_video_position;
 	return false;
 }
 
+
 void
 ImageDecoder::seek (ContentTime time, bool accurate)
 {
-	video->seek (time, accurate);
-	_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()));
 }