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 15c919e87ac3e867f9cbbf3ab97a2bb3ebf3a013..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,51 +34,21 @@ using libdcp::Size;
 
 ImageMagickDecoder::ImageMagickDecoder (shared_ptr<const Film> f, shared_ptr<const ImageMagickContent> c)
        : Decoder (f)
-       , VideoDecoder (f, c)
-       , _imagemagick_content (c)
+       , VideoDecoder (f)
+       , ImageMagick (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
-{
-       return _imagemagick_content->video_length ();
-}
-
-float
-ImageMagickDecoder::video_frame_rate () const
-{
-       boost::shared_ptr<const Film> f = _film.lock ();
-       if (!f) {
-               return 24;
-       }
-
-       return f->dcp_video_frame_rate ();
-}
-
 void
 ImageMagickDecoder::pass ()
 {
-       if (_next_video >= _imagemagick_content->length ()) {
+       if (_video_position >= _imagemagick_content->video_length ()) {
                return;
        }
 
        if (_image) {
-               video (_image, true, _next_video);
+               video (_image, true, _video_position);
                return;
        }
 
@@ -101,40 +71,25 @@ ImageMagickDecoder::pass ()
 
        delete magick_image;
 
-       _image = _image->crop (_imagemagick_content->crop(), true);
-       video (_image, false, _next_video);
+       video (_image, false, _video_position);
 }
 
 void
-ImageMagickDecoder::seek (Time t)
+ImageMagickDecoder::seek (VideoContent::Frame frame)
 {
-       _next_video = t;
+       _video_position = frame;
 }
 
 void
 ImageMagickDecoder::seek_back ()
 {
-       boost::shared_ptr<const Film> f = _film.lock ();
-       if (!f) {
-               return;
+       if (_video_position > 0) {
+               _video_position--;
        }
-       
-       _next_video -= f->video_frames_to_time (2);
-}
-
-void
-ImageMagickDecoder::seek_forward ()
-{
-       boost::shared_ptr<const Film> f = _film.lock ();
-       if (!f) {
-               return;
-       }
-       
-       _next_video += f->video_frames_to_time (1);
 }
 
-Time
-ImageMagickDecoder::next () const
+bool
+ImageMagickDecoder::done () const
 {
-       return _next_video;
+       return _video_position >= _imagemagick_content->video_length ();
 }