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 38dace6deb54b5669986a04868daa611b917c134..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
@@ -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,67 +32,36 @@ 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)
+       , ImageMagick (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
-{
-       if (_files.empty ()) {
-               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 ());
-       libdcp::Size const s = libdcp::Size (image->columns(), image->rows());
-       delete image;
-
-       return s;
-}
-
-bool
+void
 ImageMagickDecoder::pass ()
 {
-       if (_iter == _files.end()) {
-               if (video_frame() >= _film->still_duration_in_frames()) {
-                       return true;
-               }
+       if (_video_position >= _imagemagick_content->video_length ()) {
+               return;
+       }
 
-               /* XXX: timestamp is wrong */
-               repeat_last_video (0);
-               return false;
+       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());
        
-       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;
@@ -101,53 +71,25 @@ ImageMagickDecoder::pass ()
 
        delete magick_image;
 
-       image = image->crop (_film->crop(), true);
-       
-       emit_video (image, 0);
-
-       ++_iter;
-       return false;
+       video (_image, false, _video_position);
 }
 
-PixelFormat
-ImageMagickDecoder::pixel_format () const
+void
+ImageMagickDecoder::seek (VideoContent::Frame frame)
 {
-       /* XXX: always true? */
-       return PIX_FMT_RGB24;
+       _video_position = frame;
 }
 
-bool
-ImageMagickDecoder::seek_to_last ()
+void
+ImageMagickDecoder::seek_back ()
 {
-       if (_iter == _files.end()) {
-               _iter = _files.begin();
-       } else {
-               --_iter;
+       if (_video_position > 0) {
+               _video_position--;
        }
-
-       return false;
 }
 
 bool
-ImageMagickDecoder::seek (double t)
+ImageMagickDecoder::done () const
 {
-       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 ();
-       }
+       return _video_position >= _imagemagick_content->video_length ();
 }