Merge master and multifarious hackery.

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

diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc
index 279c8bf3290ab36276fa7afb1627e3cfced1b3e3..15c919e87ac3e867f9cbbf3ab97a2bb3ebf3a013 100644 (file)
--- a/src/lib/imagemagick_decoder.cc
+++ b/src/lib/imagemagick_decoder.cc
@@ -34,45 +34,64 @@ 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
+ImageMagickDecoder::video_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 (!_video_size) {
+               using namespace MagickCore;
+               Magick::Image* image = new Magick::Image (_imagemagick_content->file().string());
+               _video_size = libdcp::Size (image->columns(), image->rows());
+               delete image;
+       }
 
-       return s;
+       return _video_size.get ();
 }
 
-bool
+int
+ImageMagickDecoder::video_length () const
+{
+       return _imagemagick_content->video_length ();
+}
+
+float
+ImageMagickDecoder::video_frame_rate () const
+{
+       boost::shared_ptr<const Film> f = _film.lock ();
+       if (!f) {
+               return 24;
+       }
+
+       return f->dcp_video_frame_rate ();
+}
+
+void
 ImageMagickDecoder::pass ()
 {
-       if (_position > 0 && _position < _imagemagick_content->video_length ()) {
-               repeat_last_video ();
-               _position++;
-               return false;
-       } else if (_position >= _imagemagick_content->video_length ()) {
-               return true;
+       if (_next_video >= _imagemagick_content->length ()) {
+               return;
        }
-       
+
+       if (_image) {
+               video (_image, true, _next_video);
+               return;
+       }
+
        Magick::Image* magick_image = new Magick::Image (_imagemagick_content->file().string ());
+       _video_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, _video_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 < _video_size->height; ++y) {
+               for (int x = 0; x < _video_size->width; ++x) {
                        Magick::Color c = magick_image->pixelColor (x, y);
                        *p++ = c.redQuantum() * 255 / QuantumRange;
                        *p++ = c.greenQuantum() * 255 / QuantumRange;
@@ -82,49 +101,40 @@ ImageMagickDecoder::pass ()
 
        delete magick_image;
 
-       image = image->crop (_film->crop(), true);
-       
-       emit_video (image, 0);
-
-       ++_position;
-       return false;
+       _image = _image->crop (_imagemagick_content->crop(), true);
+       video (_image, false, _next_video);
 }
 
-PixelFormat
-ImageMagickDecoder::pixel_format () const
+void
+ImageMagickDecoder::seek (Time t)
 {
-       /* XXX: always true? */
-       return PIX_FMT_RGB24;
+       _next_video = t;
 }
 
-bool
-ImageMagickDecoder::seek_to_last ()
+void
+ImageMagickDecoder::seek_back ()
 {
-       if (_position > 0) {
-               --_position;
+       boost::shared_ptr<const Film> f = _film.lock ();
+       if (!f) {
+               return;
        }
-
-       return false;
+       
+       _next_video -= f->video_frames_to_time (2);
 }
 
-bool
-ImageMagickDecoder::seek (double t)
+void
+ImageMagickDecoder::seek_forward ()
 {
-       int const f = t * _imagemagick_content->video_frame_rate ();
-
-       if (f >= _imagemagick_content->video_length()) {
-               _position = 0;
-               return true;
+       boost::shared_ptr<const Film> f = _film.lock ();
+       if (!f) {
+               return;
        }
-
-       _position = f;
-       return false;
+       
+       _next_video += f->video_frames_to_time (1);
 }
 
-void
-ImageMagickDecoder::film_changed (Film::Property p)
+Time
+ImageMagickDecoder::next () const
 {
-       if (p == Film::CROP) {
-               OutputChanged ();
-       }
+       return _next_video;
 }