Try to fix the filter / AVFrame ownership.

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

diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc
index 9d11e043f4ceb7a46a71ab1b8a6fc54290c3bb37..5ce22c29622a403c33425a5ce6e8e9a5f3e26de5 100644 (file)
--- a/src/lib/imagemagick_decoder.cc
+++ b/src/lib/imagemagick_decoder.cc
@@ -25,13 +25,16 @@
 #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)
+       boost::shared_ptr<Film> f, DecodeOptions o)
+       : Decoder (f, o)
+       , VideoDecoder (f, o)
 {
        if (boost::filesystem::is_directory (_film->content_path())) {
                for (
@@ -50,17 +53,17 @@ ImageMagickDecoder::ImageMagickDecoder (
        _iter = _files.begin ();
 }
 
-Size
+libdcp::Size
 ImageMagickDecoder::native_size () const
 {
        if (_files.empty ()) {
-               throw DecodeError ("no still image files found");
+               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());
+       libdcp::Size const s = libdcp::Size (image->columns(), image->rows());
        delete image;
 
        return s;
@@ -70,16 +73,21 @@ bool
 ImageMagickDecoder::pass ()
 {
        if (_iter == _files.end()) {
-               return true;
+               if (video_frame() >= _film->still_duration_in_frames()) {
+                       return true;
+               }
+
+               emit_video (_image, true, double (video_frame()) / frames_per_second());
+               return false;
        }
        
-       using namespace MagickCore;
-
        Magick::Image* magick_image = new Magick::Image (_film->content_path ());
        
-       Size size = native_size ();
-       shared_ptr<CompactImage> image (new CompactImage (PIX_FMT_RGB24, size));
+       libdcp::Size size = native_size ();
+       shared_ptr<Image> image (new SimpleImage (PIX_FMT_RGB24, size, 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) {
@@ -91,8 +99,10 @@ ImageMagickDecoder::pass ()
        }
 
        delete magick_image;
-       
-       emit_video (image, 0);
+
+       _image = image->crop (_film->crop(), true);
+
+       emit_video (_image, false, double (video_frame()) / frames_per_second());
 
        ++_iter;
        return false;
@@ -105,3 +115,44 @@ 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;
+}
+
+void
+ImageMagickDecoder::film_changed (Film::Property p)
+{
+       if (p == Film::CROP) {
+               OutputChanged ();
+       }
+}
+
+float
+ImageMagickDecoder::frames_per_second () const
+{
+       return _film->source_frame_rate ();
+}