Improve FFmpeg sync, in theory.

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

diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc
index 53e1db879e16ea94a45b4e64860f37fc1c92869b..04d3d9df7c47d166c52e7692b3977d550993b547 100644 (file)
--- a/src/lib/imagemagick_decoder.cc
+++ b/src/lib/imagemagick_decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,60 +18,78 @@
 */
 
 #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"
+
+#include "i18n.h"
 
 using std::cout;
 using boost::shared_ptr;
+using libdcp::Size;
 
-ImageMagickDecoder::ImageMagickDecoder (
-       boost::shared_ptr<Film> f, boost::shared_ptr<const Options> o, Job* j)
-       : Decoder (f, o, j)
-       , _done (false)
+ImageMagickDecoder::ImageMagickDecoder (shared_ptr<const Film> f, shared_ptr<const ImageMagickContent> c)
+       : Decoder (f)
+       , VideoDecoder (f)
+       , ImageMagick (c)
 {
-       _magick_image = new Magick::Image (_film->content_path ());
-}
 
-Size
-ImageMagickDecoder::native_size () const
-{
-       return Size (_magick_image->columns(), _magick_image->rows());
 }
 
-bool
+void
 ImageMagickDecoder::pass ()
 {
-       using namespace MagickCore;
-       
-       if (_done) {
-               return true;
+       if (_video_position >= _imagemagick_content->video_length ()) {
+               return;
        }
 
-       Size size = native_size ();
-       shared_ptr<CompactImage> image (new CompactImage (PIX_FMT_RGB24, size));
+       if (_image) {
+               video (_image, true, _video_position);
+               return;
+       }
+
+       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;
                }
-
        }
-       
-       emit_video (image);
 
-       _done = true;
-       return false;
+       delete magick_image;
+
+       video (_image, false, _video_position);
+}
+
+void
+ImageMagickDecoder::seek (VideoContent::Frame frame)
+{
+       _video_position = frame;
 }
 
-PixelFormat
-ImageMagickDecoder::pixel_format () const
+void
+ImageMagickDecoder::seek_back ()
 {
-       return PIX_FMT_RGB24;
+       if (_video_position > 0) {
+               _video_position--;
+       }
 }
 
+bool
+ImageMagickDecoder::done () const
+{
+       return _video_position >= _imagemagick_content->video_length ();
+}