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 5713e68f9344696a224f468b0b29ff16c3d11876..99b9e1d340c47e5bfe8784b568ec486da754bb87 100644 (file)
--- a/src/lib/imagemagick_decoder.cc
+++ b/src/lib/imagemagick_decoder.cc
@@ -27,9 +27,10 @@
 
 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)
+       boost::shared_ptr<Film> f, DecodeOptions o, Job* j)
        : Decoder (f, o, j)
        , VideoDecoder (f, o, j)
 {
@@ -50,7 +51,7 @@ ImageMagickDecoder::ImageMagickDecoder (
        _iter = _files.begin ();
 }
 
-Size
+libdcp::Size
 ImageMagickDecoder::native_size () const
 {
        if (_files.empty ()) {
@@ -60,7 +61,7 @@ ImageMagickDecoder::native_size () const
        /* 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,12 +71,17 @@ bool
 ImageMagickDecoder::pass ()
 {
        if (_iter == _files.end()) {
-               return true;
+               if (video_frame() >= _film->still_duration_in_frames()) {
+                       return true;
+               }
+
+               repeat_last_video ();
+               return false;
        }
        
        Magick::Image* magick_image = new Magick::Image (_film->content_path ());
        
-       Size size = native_size ();
+       libdcp::Size size = native_size ();
        shared_ptr<Image> image (new SimpleImage (PIX_FMT_RGB24, size, false));
 
        using namespace MagickCore;
@@ -92,7 +98,7 @@ ImageMagickDecoder::pass ()
 
        delete magick_image;
 
-       image = image->crop (_film->crop(), false);
+       image = image->crop (_film->crop(), true);
        
        emit_video (image, 0);
 
@@ -108,8 +114,22 @@ ImageMagickDecoder::pixel_format () const
 }
 
 bool
-ImageMagickDecoder::seek (SourceFrame f)
+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()) {