Merge master.

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

diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc
index 58ba732bb57b09abdc113f6ae3646e2ebde0ea61..8702c1a33b18692dbc43b89c9e60ab416ef9e50e 100644 (file)
--- 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 "magick_image_proxy.h"
 #include "film.h"
 #include "exceptions.h"
 
@@ -42,57 +43,23 @@ ImageDecoder::ImageDecoder (shared_ptr<const ImageContent> c)
 bool
 ImageDecoder::pass ()
 {
-       if (_video_position >= _image_content->video_length ()) {
+       if (_video_position >= _image_content->video_length().frames (_image_content->video_frame_rate ())) {
                return true;
        }
 
-       if (_image && _image_content->still ()) {
-               video (_image, true, _video_position);
-               _video_position += ContentTime::from_frames (1, _image_content->video_frame_rate ());
-               return false;
+       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 ()));
        }
-
-       Magick::Image* magick_image = 0;
-
-       boost::filesystem::path const path = _image_content->path (
-               _image_content->still() ? 0 : _video_position.frames (_image_content->video_frame_rate ())
-               );
-       
-       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;
-               }
-               p += _image->stride()[0];
-       }
-
-       delete magick_image;
-
-       video (_image, false, _video_position);
-       _video_position += ContentTime::from_frames (1, _image_content->video_frame_rate ());
-
+               
+       video (_image, _video_position);
+       ++_video_position;
        return false;
 }
 
 void
 ImageDecoder::seek (ContentTime time, bool accurate)
 {
-       Decoder::seek (time, accurate);
-       _video_position = time;
+       VideoDecoder::seek (time, accurate);
+       _video_position = time.frames (_image_content->video_frame_rate ());
 }