X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_decoder.cc;h=db7c5401fa3591c536fdf6083bf0a159e366e255;hb=9a2dca23967ff404dab1a36ec3fb9075d5e8e66e;hp=d8d551ef7943310eab3ade64c80cbc9b4257d06d;hpb=f58d9e44302151dea9f594acd9fc27a331fa77fb;p=dcpomatic.git

diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc
index d8d551ef7..db7c5401f 100644
--- a/src/lib/image_decoder.cc
+++ b/src/lib/image_decoder.cc
@@ -23,6 +23,8 @@
 #include "image_content.h"
 #include "image_decoder.h"
 #include "image.h"
+#include "magick_image_proxy.h"
+#include "j2k_image_proxy.h"
 #include "film.h"
 #include "exceptions.h"
 
@@ -32,9 +34,8 @@ using std::cout;
 using boost::shared_ptr;
 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)
 	, _video_position (0)
 {
@@ -44,54 +45,31 @@ ImageDecoder::ImageDecoder (shared_ptr<const Film> f, shared_ptr<const ImageCont
 bool
 ImageDecoder::pass ()
 {
-	if (_video_position >= _image_content->video_length ()) {
+	if (_video_position >= _image_content->video_length()) {
 		return true;
 	}
 
-	if (_image && _image_content->still ()) {
-		video (_image, true, _video_position);
-		++_video_position;
-		return false;
-	}
-
-	Magick::Image* magick_image = 0;
-	boost::filesystem::path const path = _image_content->path (_image_content->still() ? 0 : _video_position);
-	try {
-		magick_image = new Magick::Image (path.string ());
-	} catch (...) {
-		throw OpenFileError (path);
-	}
-	
-	dcp::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;
+	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);
+		if (valid_j2k_file (path)) {
+			/* 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 ()));
+		} else {
+			_image.reset (new MagickImageProxy (path));
 		}
-		p += _image->stride()[0];
 	}
 
-	delete magick_image;
-
-	video (_image, false, _video_position);
+	video (_image, _video_position);
 	++_video_position;
-
 	return false;
 }
 
 void
 ImageDecoder::seek (ContentTime time, bool accurate)
 {
-	Decoder::seek (time, accurate);
-	
-	_video_position = rint (time * _video_content->video_frame_rate() / TIME_HZ);
+	VideoDecoder::seek (time, accurate);
+	_video_position = time.frames_round (_image_content->video_frame_rate ());
 }