Use dcp::file_to_string().

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

diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc
index e06f6023d54a8d35b1203f81eef72e823ab9ed0d..e1106f86d08f616455aa2323180d80212c4f6b3c 100644 (file)
--- a/src/lib/image_decoder.cc
+++ b/src/lib/image_decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,6 +18,7 @@
 
 */
 
+
 #include "image_content.h"
 #include "image_decoder.h"
 #include "video_decoder.h"
@@ -27,22 +28,28 @@
 #include "film.h"
 #include "exceptions.h"
 #include "video_content.h"
+#include "frame_interval_checker.h"
 #include <boost/filesystem.hpp>
 #include <iostream>
 
 #include "i18n.h"
 
+
 using std::cout;
-using boost::shared_ptr;
+using std::make_shared;
+using std::shared_ptr;
 using dcp::Size;
+using namespace dcpomatic;
+
 
-ImageDecoder::ImageDecoder (shared_ptr<const ImageContent> c, shared_ptr<Log> log)
-       : _image_content (c)
-       , _frame_video_position (0)
+ImageDecoder::ImageDecoder (shared_ptr<const Film> film, shared_ptr<const ImageContent> c)
+       : Decoder (film)
+       , _image_content (c)
 {
-       video.reset (new VideoDecoder (this, c, log));
+       video = make_shared<VideoDecoder>(this, c);
 }
 
+
 bool
 ImageDecoder::pass ()
 {
@@ -52,7 +59,7 @@ ImageDecoder::pass ()
 
        if (!_image_content->still() || !_image) {
                /* Either we need an image or we are using moving images, so load one */
-               boost::filesystem::path path = _image_content->path (_image_content->still() ? 0 : _frame_video_position);
+               auto path = _image_content->path (_image_content->still() ? 0 : _frame_video_position);
                if (valid_j2k_file (path)) {
                        AVPixelFormat pf;
                        if (_image_content->video->colour_conversion()) {
@@ -65,20 +72,21 @@ ImageDecoder::pass ()
                        /* 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(), pf));
+                       _image = make_shared<J2KImageProxy>(path, _image_content->video->size(), pf);
                } else {
-                       _image.reset (new FFmpegImageProxy (path));
+                       _image = make_shared<FFmpegImageProxy>(path);
                }
        }
 
-       video->emit (_image, _frame_video_position);
+       video->emit (film(), _image, _frame_video_position);
        ++_frame_video_position;
        return false;
 }
 
+
 void
 ImageDecoder::seek (ContentTime time, bool accurate)
 {
        Decoder::seek (time, accurate);
-       _frame_video_position = time.frames_round (_image_content->active_video_frame_rate ());
+       _frame_video_position = time.frames_round (_image_content->active_video_frame_rate(film()));
 }