Basics of splitting up Decoder tree like Content.

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

diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc
index 250c8f845b6c2f10141aac2c3c46dd2e7fe55dbd..71157dd5dcaa8b54eaf980c5f8a54ae18e61e8de 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,16 +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 "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"
 
@@ -34,18 +36,17 @@ 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 (PassReason)
+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;
        }
 
@@ -56,13 +57,13 @@ ImageDecoder::pass (PassReason)
                        /* 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 ()));
+                       _image.reset (new J2KImageProxy (path, _image_content->video->size ()));
                } else {
                        _image.reset (new MagickImageProxy (path));
                }
        }
-               
-       video (_image, _video_position);
+
+       video->video (_image, _video_position);
        ++_video_position;
        return false;
 }
@@ -70,6 +71,6 @@ ImageDecoder::pass (PassReason)
 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 ());
 }