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 ed2db80d8c0dc72a0da62fabc0e213a3a825b4e4..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
@@ -34,55 +34,34 @@ using libdcp::Size;
 
 ImageMagickDecoder::ImageMagickDecoder (shared_ptr<const Film> f, shared_ptr<const ImageMagickContent> c)
        : Decoder (f)
-       , VideoDecoder (f, c)
-       , _imagemagick_content (c)
-       , _position (0)
+       , VideoDecoder (f)
+       , ImageMagick (c)
 {
 
 }
 
-libdcp::Size
-ImageMagickDecoder::native_size () const
-{
-       if (!_native_size) {
-               using namespace MagickCore;
-               Magick::Image* image = new Magick::Image (_imagemagick_content->file().string());
-               _native_size = libdcp::Size (image->columns(), image->rows());
-               delete image;
-       }
-
-       return _native_size.get ();
-}
-
-int
-ImageMagickDecoder::video_length () const
-{
-       return _imagemagick_content->video_length ();
-}
-
-bool
+void
 ImageMagickDecoder::pass ()
 {
-       if (_position < 0 || _position >= _imagemagick_content->video_length ()) {
-               return true;
+       if (_video_position >= _imagemagick_content->video_length ()) {
+               return;
        }
 
        if (_image) {
-               emit_video (_image, true, double (_position) / 24);
-               _position++;
-               return false;
+               video (_image, true, _video_position);
+               return;
        }
 
        Magick::Image* magick_image = new Magick::Image (_imagemagick_content->file().string ());
-       _native_size = libdcp::Size (magick_image->columns(), magick_image->rows());
+       _video_size = libdcp::Size (magick_image->columns(), magick_image->rows());
        
-       _image.reset (new SimpleImage (PIX_FMT_RGB24, _native_size.get(), 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 < _native_size->height; ++y) {
-               for (int x = 0; x < _native_size->width; ++x) {
+       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;
@@ -92,36 +71,25 @@ ImageMagickDecoder::pass ()
 
        delete magick_image;
 
-       _image = _image->crop (_imagemagick_content->crop(), true);
-       emit_video (_image, false, double (_position) / 24);
-
-       ++_position;
-       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 (double t)
+void
+ImageMagickDecoder::seek_back ()
 {
-       int const f = t * _imagemagick_content->video_frame_rate ();
-
-       if (f >= _imagemagick_content->video_length()) {
-               _position = 0;
-               return true;
+       if (_video_position > 0) {
+               _video_position--;
        }
-
-       _position = f;
-       return false;
 }
 
-Time
-ImageMagickDecoder::next () const
+bool
+ImageMagickDecoder::done () const
 {
-       return _next_video;
+       return _video_position >= _imagemagick_content->video_length ();
 }