Untested merge of master.

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

diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc
index 81349beca72e3ceb8a4ff37cd136698b78439140..3888347ca73329359192539aa81a21fd3cc3e1ca 100644 (file)
--- a/src/lib/imagemagick_decoder.cc
+++ b/src/lib/imagemagick_decoder.cc
@@ -18,60 +18,102 @@
 */
 
 #include <iostream>
+#include <boost/filesystem.hpp>
 #include <Magick++.h>
+#include "imagemagick_content.h"
 #include "imagemagick_decoder.h"
 #include "image.h"
 #include "film.h"
+#include "exceptions.h"
 
-using namespace std;
-using namespace boost;
+#include "i18n.h"
 
-ImageMagickDecoder::ImageMagickDecoder (
-       boost::shared_ptr<Film> f, boost::shared_ptr<const Options> o, Job* j, bool minimal)
-       : Decoder (f, o, j, minimal)
-       , _done (false)
+using std::cout;
+using boost::shared_ptr;
+using libdcp::Size;
+
+ImageMagickDecoder::ImageMagickDecoder (shared_ptr<const Film> f, shared_ptr<const ImageMagickContent> c)
+       : Decoder (f)
+       , VideoDecoder (f)
+       , _imagemagick_content (c)
+       , _position (0)
 {
-       _magick_image = new Magick::Image (_film->content_path ());
+       
 }
 
-Size
+libdcp::Size
 ImageMagickDecoder::native_size () const
 {
-       return Size (_magick_image->columns(), _magick_image->rows());
+       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;
+
+       return s;
+}
+
+int
+ImageMagickDecoder::video_length () const
+{
+       return _imagemagick_content->video_length ();
 }
 
 bool
 ImageMagickDecoder::pass ()
 {
-       using namespace MagickCore;
-       
-       if (_done) {
+       if (_position < 0 || _position >= _imagemagick_content->video_length ()) {
                return true;
        }
 
-       Size size = native_size ();
-       RGBFrameImage image (size);
+       if (_image) {
+               emit_video (_image, true, double (_position) / 24);
+               _position++;
+               return false;
+       }
+       
+       Magick::Image* magick_image = new Magick::Image (_imagemagick_content->file().string ());
+       
+       libdcp::Size size = native_size ();
+       _image.reset (new SimpleImage (PIX_FMT_RGB24, size, false));
 
-       uint8_t* p = image.data()[0];
+       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) {
-                       Magick::Color c = _magick_image->pixelColor (x, y);
+                       Magick::Color c = magick_image->pixelColor (x, y);
                        *p++ = c.redQuantum() * 255 / QuantumRange;
                        *p++ = c.greenQuantum() * 255 / QuantumRange;
                        *p++ = c.blueQuantum() * 255 / QuantumRange;
                }
-
        }
-       
-       process_video (image.frame ());
 
-       _done = true;
+       delete magick_image;
+
+       _image = _image->crop (_film->crop(), true);
+       emit_video (_image, false, double (_position) / 24);
+
+       ++_position;
        return false;
 }
 
 PixelFormat
 ImageMagickDecoder::pixel_format () const
 {
+       /* XXX: always true? */
        return PIX_FMT_RGB24;
 }
 
+bool
+ImageMagickDecoder::seek (double t)
+{
+       int const f = t * _imagemagick_content->video_frame_rate ();
+
+       if (f >= _imagemagick_content->video_length()) {
+               _position = 0;
+               return true;
+       }
+
+       _position = f;
+       return false;
+}