Merge master branch.

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

diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc
index 81349beca72e3ceb8a4ff37cd136698b78439140..99b9e1d340c47e5bfe8784b568ec486da754bb87 100644 (file)
--- a/src/lib/imagemagick_decoder.cc
+++ b/src/lib/imagemagick_decoder.cc
@@ -18,60 +18,133 @@
 */
 
 #include <iostream>
+#include <boost/filesystem.hpp>
 #include <Magick++.h>
 #include "imagemagick_decoder.h"
 #include "image.h"
 #include "film.h"
+#include "exceptions.h"
 
-using namespace std;
-using namespace boost;
+using std::cout;
+using boost::shared_ptr;
+using libdcp::Size;
 
 ImageMagickDecoder::ImageMagickDecoder (
-       boost::shared_ptr<Film> f, boost::shared_ptr<const Options> o, Job* j, bool minimal)
-       : Decoder (f, o, j, minimal)
-       , _done (false)
+       boost::shared_ptr<Film> f, DecodeOptions o, Job* j)
+       : Decoder (f, o, j)
+       , VideoDecoder (f, o, j)
 {
-       _magick_image = new Magick::Image (_film->content_path ());
+       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
 {
-       return Size (_magick_image->columns(), _magick_image->rows());
+       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 ());
+       libdcp::Size const s = libdcp::Size (image->columns(), image->rows());
+       delete image;
+
+       return s;
 }
 
 bool
 ImageMagickDecoder::pass ()
 {
-       using namespace MagickCore;
-       
-       if (_done) {
-               return true;
-       }
+       if (_iter == _files.end()) {
+               if (video_frame() >= _film->still_duration_in_frames()) {
+                       return true;
+               }
 
-       Size size = native_size ();
-       RGBFrameImage image (size);
+               repeat_last_video ();
+               return false;
+       }
+       
+       Magick::Image* magick_image = new Magick::Image (_film->content_path ());
+       
+       libdcp::Size size = native_size ();
+       shared_ptr<Image> image (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;
                }
-
        }
+
+       delete magick_image;
+
+       image = image->crop (_film->crop(), true);
        
-       process_video (image.frame ());
+       emit_video (image, 0);
 
-       _done = true;
+       ++_iter;
        return false;
 }
 
 PixelFormat
 ImageMagickDecoder::pixel_format () const
 {
+       /* XXX: always true? */
        return PIX_FMT_RGB24;
 }
 
+bool
+ImageMagickDecoder::seek_to_last ()
+{
+       if (_iter == _files.end()) {
+               _iter = _files.begin();
+       } else {
+               --_iter;
+       }
+
+       return false;
+}
+
+bool
+ImageMagickDecoder::seek (double t)
+{
+       int const f = t * frames_per_second();
+       
+       _iter = _files.begin ();
+       for (int i = 0; i < f; ++i) {
+               if (_iter == _files.end()) {
+                       return true;
+               }
+               ++_iter;
+       }
+       
+       return false;
+}
+
+void
+ImageMagickDecoder::film_changed (Film::Property p)
+{
+       if (p == Film::CROP) {
+               OutputChanged ();
+       }
+}