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 9d11e043f4ceb7a46a71ab1b8a6fc54290c3bb37..3888347ca73329359192539aa81a21fd3cc3e1ca 100644 (file)
--- a/src/lib/imagemagick_decoder.cc
+++ b/src/lib/imagemagick_decoder.cc
@@ -20,67 +20,65 @@
 #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"
 
+#include "i18n.h"
+
 using std::cout;
 using boost::shared_ptr;
+using libdcp::Size;
 
-ImageMagickDecoder::ImageMagickDecoder (
-       boost::shared_ptr<Film> f, boost::shared_ptr<const DecodeOptions> o, Job* j)
-       : Decoder (f, o, j)
-       , VideoDecoder (f, o, j)
+ImageMagickDecoder::ImageMagickDecoder (shared_ptr<const Film> f, shared_ptr<const ImageMagickContent> c)
+       : Decoder (f)
+       , VideoDecoder (f)
+       , _imagemagick_content (c)
+       , _position (0)
 {
-       if (boost::filesystem::is_directory (_film->content_path())) {
-               for (
-                       boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (_film->content_path());
-                       i != boost::filesystem::directory_iterator();
-                       ++i) {
-
-                       if (still_image_file (i->path().string())) {
-                               _files.push_back (i->path().string());
-                       }
-               }
-       } else {
-               _files.push_back (_film->content_path ());
-       }
-
-       _iter = _files.begin ();
+       
 }
 
-Size
+libdcp::Size
 ImageMagickDecoder::native_size () const
 {
-       if (_files.empty ()) {
-               throw DecodeError ("no still image files found");
-       }
-
-       /* Look at the first file and assume its size holds for all */
        using namespace MagickCore;
-       Magick::Image* image = new Magick::Image (_film->content_path ());
-       Size const s = Size (image->columns(), image->rows());
+       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 ()
 {
-       if (_iter == _files.end()) {
+       if (_position < 0 || _position >= _imagemagick_content->video_length ()) {
                return true;
        }
-       
-       using namespace MagickCore;
 
-       Magick::Image* magick_image = new Magick::Image (_film->content_path ());
+       if (_image) {
+               emit_video (_image, true, double (_position) / 24);
+               _position++;
+               return false;
+       }
        
-       Size size = native_size ();
-       shared_ptr<CompactImage> image (new CompactImage (PIX_FMT_RGB24, size));
+       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);
@@ -91,10 +89,11 @@ ImageMagickDecoder::pass ()
        }
 
        delete magick_image;
-       
-       emit_video (image, 0);
 
-       ++_iter;
+       _image = _image->crop (_film->crop(), true);
+       emit_video (_image, false, double (_position) / 24);
+
+       ++_position;
        return false;
 }
 
@@ -105,3 +104,16 @@ ImageMagickDecoder::pixel_format () const
        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;
+}