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 5ce22c29622a403c33425a5ce6e8e9a5f3e26de5..3888347ca73329359192539aa81a21fd3cc3e1ca 100644 (file)
--- a/src/lib/imagemagick_decoder.cc
+++ b/src/lib/imagemagick_decoder.cc
@@ -20,6 +20,7 @@
 #include <iostream>
 #include <boost/filesystem.hpp>
 #include <Magick++.h>
+#include "imagemagick_content.h"
 #include "imagemagick_decoder.h"
 #include "image.h"
 #include "film.h"
@@ -31,64 +32,53 @@ using std::cout;
 using boost::shared_ptr;
 using libdcp::Size;
 
-ImageMagickDecoder::ImageMagickDecoder (
-       boost::shared_ptr<Film> f, DecodeOptions o)
-       : Decoder (f, o)
-       , VideoDecoder (f, o)
+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 ();
+       
 }
 
 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 ());
+       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 (video_frame() >= _film->still_duration_in_frames()) {
-                       return true;
-               }
+       if (_position < 0 || _position >= _imagemagick_content->video_length ()) {
+               return true;
+       }
 
-               emit_video (_image, true, double (video_frame()) / frames_per_second());
+       if (_image) {
+               emit_video (_image, true, double (_position) / 24);
+               _position++;
                return false;
        }
        
-       Magick::Image* magick_image = new Magick::Image (_film->content_path ());
+       Magick::Image* magick_image = new Magick::Image (_imagemagick_content->file().string ());
        
        libdcp::Size size = native_size ();
-       shared_ptr<Image> image (new SimpleImage (PIX_FMT_RGB24, size, false));
+       _image.reset (new SimpleImage (PIX_FMT_RGB24, size, false));
 
        using namespace MagickCore;
        
-       uint8_t* p = image->data()[0];
+       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);
@@ -100,11 +90,10 @@ ImageMagickDecoder::pass ()
 
        delete magick_image;
 
-       _image = image->crop (_film->crop(), true);
-
-       emit_video (_image, false, double (video_frame()) / frames_per_second());
+       _image = _image->crop (_film->crop(), true);
+       emit_video (_image, false, double (_position) / 24);
 
-       ++_iter;
+       ++_position;
        return false;
 }
 
@@ -115,44 +104,16 @@ ImageMagickDecoder::pixel_format () const
        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;
-}
+       int const f = t * _imagemagick_content->video_frame_rate ();
 
-void
-ImageMagickDecoder::film_changed (Film::Property p)
-{
-       if (p == Film::CROP) {
-               OutputChanged ();
+       if (f >= _imagemagick_content->video_length()) {
+               _position = 0;
+               return true;
        }
-}
 
-float
-ImageMagickDecoder::frames_per_second () const
-{
-       return _film->source_frame_rate ();
+       _position = f;
+       return false;
 }