Merge master.

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

diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc
index aa3c64f931f7e4e48d241cab70ef1ec01b1ec872..dd18ad64ed03e94957343f8105ca34eb0353a658 100644 (file)
--- a/src/lib/imagemagick_decoder.cc
+++ b/src/lib/imagemagick_decoder.cc
@@ -32,48 +32,57 @@ using std::cout;
 using boost::shared_ptr;
 using libdcp::Size;
 
-ImageMagickDecoder::ImageMagickDecoder (
-       shared_ptr<const Film> f, shared_ptr<ImageMagickContent> c, DecodeOptions o)
-       : Decoder (f, o)
-       , VideoDecoder (f, c, o)
+ImageMagickDecoder::ImageMagickDecoder (shared_ptr<const Film> f, shared_ptr<const ImageMagickContent> c)
+       : Decoder (f)
+       , VideoDecoder (f)
        , _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
+ImageMagickDecoder::video_length () const
+{
+       return _imagemagick_content->video_length ();
 }
 
 bool
 ImageMagickDecoder::pass ()
 {
-       if (_position > 0 && _position < _imagemagick_content->video_length ()) {
-               repeat_last_video ();
+       if (_position < 0 || _position >= _imagemagick_content->video_length ()) {
+               return true;
+       }
+
+       if (_image) {
+               emit_video (_image, true, double (_position) / 24);
                _position++;
                return false;
-       } else if (_position >= _imagemagick_content->video_length ()) {
-               return true;
        }
-       
+
        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;
@@ -83,9 +92,8 @@ ImageMagickDecoder::pass ()
 
        delete magick_image;
 
-       image = image->crop (_film->crop(), true);
-       
-       emit_video (image, 0);
+       _image = _image->crop (_film->crop(), true);
+       emit_video (_image, false, double (_position) / 24);
 
        ++_position;
        return false;
@@ -98,16 +106,6 @@ ImageMagickDecoder::pixel_format () const
        return PIX_FMT_RGB24;
 }
 
-bool
-ImageMagickDecoder::seek_to_last ()
-{
-       if (_position > 0) {
-               --_position;
-       }
-
-       return false;
-}
-
 bool
 ImageMagickDecoder::seek (double t)
 {
@@ -121,11 +119,3 @@ ImageMagickDecoder::seek (double t)
        _position = f;
        return false;
 }
-
-void
-ImageMagickDecoder::film_changed (Film::Property p)
-{
-       if (p == Film::CROP) {
-               OutputChanged ();
-       }
-}