Merge master and multifarious hackery.

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

diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc
index 81349beca72e3ceb8a4ff37cd136698b78439140..15c919e87ac3e867f9cbbf3ab97a2bb3ebf3a013 100644 (file)
--- a/src/lib/imagemagick_decoder.cc
+++ b/src/lib/imagemagick_decoder.cc
@@ -18,60 +18,123 @@
 */
 
 #include <iostream>
+#include <boost/filesystem.hpp>
 #include <Magick++.h>
+#include "imagemagick_content.h"
 #include "imagemagick_decoder.h"
 #include "image.h"
 #include "film.h"
+#include "exceptions.h"
 
-using namespace std;
-using namespace boost;
+#include "i18n.h"
 
-ImageMagickDecoder::ImageMagickDecoder (
-       boost::shared_ptr<Film> f, boost::shared_ptr<const Options> o, Job* j, bool minimal)
-       : Decoder (f, o, j, minimal)
-       , _done (false)
+using std::cout;
+using boost::shared_ptr;
+using libdcp::Size;
+
+ImageMagickDecoder::ImageMagickDecoder (shared_ptr<const Film> f, shared_ptr<const ImageMagickContent> c)
+       : Decoder (f)
+       , VideoDecoder (f, c)
+       , _imagemagick_content (c)
+{
+
+}
+
+libdcp::Size
+ImageMagickDecoder::video_size () const
+{
+       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;
+       }
+
+       return _video_size.get ();
+}
+
+int
+ImageMagickDecoder::video_length () const
 {
-       _magick_image = new Magick::Image (_film->content_path ());
+       return _imagemagick_content->video_length ();
 }
 
-Size
-ImageMagickDecoder::native_size () const
+float
+ImageMagickDecoder::video_frame_rate () const
 {
-       return Size (_magick_image->columns(), _magick_image->rows());
+       boost::shared_ptr<const Film> f = _film.lock ();
+       if (!f) {
+               return 24;
+       }
+
+       return f->dcp_video_frame_rate ();
 }
 
-bool
+void
 ImageMagickDecoder::pass ()
 {
-       using namespace MagickCore;
-       
-       if (_done) {
-               return true;
+       if (_next_video >= _imagemagick_content->length ()) {
+               return;
+       }
+
+       if (_image) {
+               video (_image, true, _next_video);
+               return;
        }
 
-       Size size = native_size ();
-       RGBFrameImage image (size);
+       Magick::Image* magick_image = new Magick::Image (_imagemagick_content->file().string ());
+       _video_size = libdcp::Size (magick_image->columns(), magick_image->rows());
+       
+       _image.reset (new SimpleImage (PIX_FMT_RGB24, _video_size.get(), false));
 
-       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);
+       using namespace MagickCore;
+       
+       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;
                        *p++ = c.blueQuantum() * 255 / QuantumRange;
                }
+       }
+
+       delete magick_image;
+
+       _image = _image->crop (_imagemagick_content->crop(), true);
+       video (_image, false, _next_video);
+}
+
+void
+ImageMagickDecoder::seek (Time t)
+{
+       _next_video = t;
+}
 
+void
+ImageMagickDecoder::seek_back ()
+{
+       boost::shared_ptr<const Film> f = _film.lock ();
+       if (!f) {
+               return;
        }
        
-       process_video (image.frame ());
-
-       _done = true;
-       return false;
+       _next_video -= f->video_frames_to_time (2);
 }
 
-PixelFormat
-ImageMagickDecoder::pixel_format () const
+void
+ImageMagickDecoder::seek_forward ()
 {
-       return PIX_FMT_RGB24;
+       boost::shared_ptr<const Film> f = _film.lock ();
+       if (!f) {
+               return;
+       }
+       
+       _next_video += f->video_frames_to_time (1);
 }
 
+Time
+ImageMagickDecoder::next () const
+{
+       return _next_video;
+}