Test filling of stuff with black.

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

diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc
index 5ce22c29622a403c33425a5ce6e8e9a5f3e26de5..7da0ed551e3a86960dd7183c222241ece9318f90 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,66 +32,66 @@ 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, c)
+       , _imagemagick_content (c)
 {
-       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
+ImageMagickDecoder::video_size () const
 {
-       if (_files.empty ()) {
-               throw DecodeError (_("no still image files found"));
+       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;
        }
 
-       /* 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 _video_size.get ();
+}
 
-       return s;
+int
+ImageMagickDecoder::video_length () const
+{
+       return _imagemagick_content->video_length ();
 }
 
-bool
+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 (_iter == _files.end()) {
-               if (video_frame() >= _film->still_duration_in_frames()) {
-                       return true;
-               }
+       if (_next_video >= _imagemagick_content->length ()) {
+               return;
+       }
 
-               emit_video (_image, true, double (video_frame()) / frames_per_second());
-               return false;
+       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());
        
-       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));
+       _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;
@@ -100,59 +101,48 @@ ImageMagickDecoder::pass ()
 
        delete magick_image;
 
-       _image = image->crop (_film->crop(), true);
-
-       emit_video (_image, false, double (video_frame()) / frames_per_second());
-
-       ++_iter;
-       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 (_iter == _files.end()) {
-               _iter = _files.begin();
-       } else {
-               --_iter;
+       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 * frames_per_second();
-       
-       _iter = _files.begin ();
-       for (int i = 0; i < f; ++i) {
-               if (_iter == _files.end()) {
-                       return true;
-               }
-               ++_iter;
+       boost::shared_ptr<const Film> f = _film.lock ();
+       if (!f) {
+               return;
        }
        
-       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;
 }
 
-float
-ImageMagickDecoder::frames_per_second () const
+
+bool
+ImageMagickDecoder::done () const
 {
-       return _film->source_frame_rate ();
+       return video_done ();
 }
+