X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_decoder.cc;h=9f83d1d896d1444579bcd157b214b389468b9f30;hb=39bc73fe192f932ed6695eb87b19de446e8b4f55;hp=fb6053ae5226188d91f31809133df65aec47d011;hpb=98060a4e6f02b418f30b4b736e5880a357454c40;p=dcpomatic.git

diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc
index fb6053ae5..9f83d1d89 100644
--- a/src/lib/image_decoder.cc
+++ b/src/lib/image_decoder.cc
@@ -23,6 +23,7 @@
 #include "image_content.h"
 #include "image_decoder.h"
 #include "image.h"
+#include "image_proxy.h"
 #include "film.h"
 #include "exceptions.h"
 
@@ -30,60 +31,35 @@
 
 using std::cout;
 using boost::shared_ptr;
-using libdcp::Size;
+using dcp::Size;
 
-ImageDecoder::ImageDecoder (shared_ptr<const Film> f, shared_ptr<const ImageContent> c)
-	: Decoder (f)
-	, VideoDecoder (f, c)
+ImageDecoder::ImageDecoder (shared_ptr<const ImageContent> c)
+	: VideoDecoder (c)
 	, _image_content (c)
 {
 
 }
 
-void
+bool
 ImageDecoder::pass ()
 {
-	if (_video_position >= _image_content->video_length ()) {
-		return;
-	}
-
-	if (_image && _image_content->still ()) {
-		video (_image, true, _video_position);
-		return;
+	if (_video_position >= _image_content->video_length().frames (_image_content->video_frame_rate ())) {
+		return true;
 	}
 
-	Magick::Image* magick_image = new Magick::Image (_image_content->path (_image_content->still() ? 0 : _video_position).string ());
-	libdcp::Size size (magick_image->columns(), magick_image->rows());
-
-	_image.reset (new Image (PIX_FMT_RGB24, size, true));
-
-	using namespace MagickCore;
-	
-	uint8_t* p = _image->data()[0];
-	for (int y = 0; y < size.height; ++y) {
-		uint8_t* q = p;
-		for (int x = 0; x < size.width; ++x) {
-			Magick::Color c = magick_image->pixelColor (x, y);
-			*q++ = c.redQuantum() * 255 / QuantumRange;
-			*q++ = c.greenQuantum() * 255 / QuantumRange;
-			*q++ = c.blueQuantum() * 255 / QuantumRange;
-		}
-		p += _image->stride()[0];
+	if (!_image_content->still() || !_image) {
+		/* Either we need an image or we are using moving images, so load one */
+		_image.reset (new MagickImageProxy (_image_content->path (_image_content->still() ? 0 : _video_position)));
 	}
-
-	delete magick_image;
-
-	video (_image, false, _video_position);
+		
+	video (_image, _video_position);
+	++_video_position;
+	return false;
 }
 
 void
-ImageDecoder::seek (VideoContent::Frame frame, bool)
-{
-	_video_position = frame;
-}
-
-bool
-ImageDecoder::done () const
+ImageDecoder::seek (ContentTime time, bool accurate)
 {
-	return _video_position >= _image_content->video_length ();
+	VideoDecoder::seek (time, accurate);
+	_video_position = time.frames (_image_content->video_frame_rate ());
 }