X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_decoder.cc;h=db7c5401fa3591c536fdf6083bf0a159e366e255;hb=4685843ba4194d8b59ed6eb1335ae27052178726;hp=d3cdbd6f1ee753b994919cd677828662c1b96a8e;hpb=0da7c88a1afb221f97e2e96c159b1a984e4e2f71;p=dcpomatic.git

diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc
index d3cdbd6f1..db7c5401f 100644
--- a/src/lib/image_decoder.cc
+++ b/src/lib/image_decoder.cc
@@ -23,7 +23,8 @@
 #include "image_content.h"
 #include "image_decoder.h"
 #include "image.h"
-#include "image_proxy.h"
+#include "magick_image_proxy.h"
+#include "j2k_image_proxy.h"
 #include "film.h"
 #include "exceptions.h"
 
@@ -36,6 +37,7 @@ using dcp::Size;
 ImageDecoder::ImageDecoder (shared_ptr<const ImageContent> c)
 	: VideoDecoder (c)
 	, _image_content (c)
+	, _video_position (0)
 {
 
 }
@@ -43,15 +45,23 @@ ImageDecoder::ImageDecoder (shared_ptr<const ImageContent> c)
 bool
 ImageDecoder::pass ()
 {
-	if (_video_position >= _image_content->video_length().frames (_image_content->video_frame_rate ())) {
+	if (_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 */
-		_image.reset (new MagickImageProxy (_image_content->path (_image_content->still() ? 0 : _video_position), _image_content->film()->log ()));
+		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));
+		}
 	}
-		
+
 	video (_image, _video_position);
 	++_video_position;
 	return false;
@@ -61,5 +71,5 @@ void
 ImageDecoder::seek (ContentTime time, bool accurate)
 {
 	VideoDecoder::seek (time, accurate);
-	_video_position = time.frames (_image_content->video_frame_rate ());
+	_video_position = time.frames_round (_image_content->video_frame_rate ());
 }