No-op: remove all trailing whitespace.

[dcpomatic.git] / src / lib / image_decoder.cc

diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc
index 8702c1a33b18692dbc43b89c9e60ab416ef9e50e..3d543eaf28562572a8ee3f0ce29d50cd3b921ec6 100644 (file)
--- a/src/lib/image_decoder.cc
+++ b/src/lib/image_decoder.cc
@@ -24,6 +24,7 @@
 #include "image_decoder.h"
 #include "image.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;