Rename some methods.

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

diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc
index d3cdbd6f1ee753b994919cd677828662c1b96a8e..588d89246f120c62a580890f146fd30259d5f529 100644 (file)
--- a/src/lib/image_decoder.cc
+++ b/src/lib/image_decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 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
@@ -17,15 +17,18 @@
 
 */
 
-#include <iostream>
-#include <boost/filesystem.hpp>
-#include <Magick++.h>
 #include "image_content.h"
 #include "image_decoder.h"
+#include "video_decoder.h"
 #include "image.h"
-#include "image_proxy.h"
+#include "magick_image_proxy.h"
+#include "j2k_image_proxy.h"
 #include "film.h"
 #include "exceptions.h"
+#include "video_content.h"
+#include <Magick++.h>
+#include <boost/filesystem.hpp>
+#include <iostream>
 
 #include "i18n.h"
 
@@ -33,26 +36,34 @@ using std::cout;
 using boost::shared_ptr;
 using dcp::Size;
 
-ImageDecoder::ImageDecoder (shared_ptr<const ImageContent> c)
-       : VideoDecoder (c)
-       , _image_content (c)
+ImageDecoder::ImageDecoder (shared_ptr<const ImageContent> c, shared_ptr<Log> log)
+       : _image_content (c)
+       , _video_position (0)
 {
-
+       video.reset (new VideoDecoder (this, c, log));
 }
 
 bool
-ImageDecoder::pass ()
+ImageDecoder::pass (PassReason, bool)
 {
-       if (_video_position >= _image_content->video_length().frames (_image_content->video_frame_rate ())) {
+       if (_video_position >= _image_content->video->length()) {
                return true;
        }
 
        if (!_image_content->still() || !_image) {
                /* Either we need an image or we are using moving images, so load one */
-               _image.reset (new MagickImageProxy (_image_content->path (_image_content->still() ? 0 : _video_position), _image_content->film()->log ()));
+               boost::filesystem::path path = _image_content->path (_image_content->still() ? 0 : _video_position);
+               if (valid_j2k_file (path)) {
+                       /* We can't extract image size from a JPEG2000 codestream without decoding it,
+                          so pass in the image content's size here.
+                       */
+                       _image.reset (new J2KImageProxy (path, _image_content->video->size ()));
+               } else {
+                       _image.reset (new MagickImageProxy (path));
+               }
        }
-               
-       video (_image, _video_position);
+
+       video->give (_image, _video_position);
        ++_video_position;
        return false;
 }
@@ -60,6 +71,6 @@ ImageDecoder::pass ()
 void
 ImageDecoder::seek (ContentTime time, bool accurate)
 {
-       VideoDecoder::seek (time, accurate);
-       _video_position = time.frames (_image_content->video_frame_rate ());
+       video->seek (time, accurate);
+       _video_position = time.frames_round (_image_content->active_video_frame_rate ());
 }