Various hacks.

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

diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc
index 7049b7d6e31945ace55eadd9e16bc4ef6f04a170..ed2db80d8c0dc72a0da62fabc0e213a3a825b4e4 100644 (file)
--- a/src/lib/imagemagick_decoder.cc
+++ b/src/lib/imagemagick_decoder.cc
@@ -34,22 +34,24 @@ using libdcp::Size;
 
 ImageMagickDecoder::ImageMagickDecoder (shared_ptr<const Film> f, shared_ptr<const ImageMagickContent> c)
        : Decoder (f)
-       , VideoDecoder (f)
+       , VideoDecoder (f, c)
        , _imagemagick_content (c)
        , _position (0)
 {
-       
+
 }
 
 libdcp::Size
 ImageMagickDecoder::native_size () const
 {
-       using namespace MagickCore;
-       Magick::Image* image = new Magick::Image (_imagemagick_content->file().string());
-       libdcp::Size const s = libdcp::Size (image->columns(), image->rows());
-       delete image;
+       if (!_native_size) {
+               using namespace MagickCore;
+               Magick::Image* image = new Magick::Image (_imagemagick_content->file().string());
+               _native_size = libdcp::Size (image->columns(), image->rows());
+               delete image;
+       }
 
-       return s;
+       return _native_size.get ();
 }
 
 int
@@ -65,22 +67,22 @@ ImageMagickDecoder::pass ()
                return true;
        }
 
-       if (have_last_video ()) {
-               repeat_last_video (double (_position) / 24);
+       if (_image) {
+               emit_video (_image, true, double (_position) / 24);
                _position++;
                return false;
        }
-       
+
        Magick::Image* magick_image = new Magick::Image (_imagemagick_content->file().string ());
+       _native_size = libdcp::Size (magick_image->columns(), magick_image->rows());
        
-       libdcp::Size size = native_size ();
-       shared_ptr<Image> image (new SimpleImage (PIX_FMT_RGB24, size, false));
+       _image.reset (new SimpleImage (PIX_FMT_RGB24, _native_size.get(), false));
 
        using namespace MagickCore;
        
-       uint8_t* p = image->data()[0];
-       for (int y = 0; y < size.height; ++y) {
-               for (int x = 0; x < size.width; ++x) {
+       uint8_t* p = _image->data()[0];
+       for (int y = 0; y < _native_size->height; ++y) {
+               for (int x = 0; x < _native_size->width; ++x) {
                        Magick::Color c = magick_image->pixelColor (x, y);
                        *p++ = c.redQuantum() * 255 / QuantumRange;
                        *p++ = c.greenQuantum() * 255 / QuantumRange;
@@ -90,9 +92,8 @@ ImageMagickDecoder::pass ()
 
        delete magick_image;
 
-       image = image->crop (_film->crop(), true);
-       
-       emit_video (image, double (_position) / 24);
+       _image = _image->crop (_imagemagick_content->crop(), true);
+       emit_video (_image, false, double (_position) / 24);
 
        ++_position;
        return false;
@@ -118,3 +119,9 @@ ImageMagickDecoder::seek (double t)
        _position = f;
        return false;
 }
+
+Time
+ImageMagickDecoder::next () const
+{
+       return _next_video;
+}