/*
- 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.
*/
+
+#include "exceptions.h"
+#include "ffmpeg_image_proxy.h"
+#include "film.h"
+#include "frame_interval_checker.h"
+#include "image.h"
#include "image_content.h"
#include "image_decoder.h"
-#include "video_decoder.h"
-#include "image.h"
-#include "ffmpeg_image_proxy.h"
#include "j2k_image_proxy.h"
-#include "film.h"
-#include "exceptions.h"
#include "video_content.h"
-#include "frame_interval_checker.h"
+#include "video_decoder.h"
#include <boost/filesystem.hpp>
#include <iostream>
#include "i18n.h"
+
using std::cout;
+using std::make_shared;
using std::shared_ptr;
using dcp::Size;
using namespace dcpomatic;
+
ImageDecoder::ImageDecoder (shared_ptr<const Film> film, shared_ptr<const ImageContent> c)
: Decoder (film)
, _image_content (c)
- , _frame_video_position (0)
{
- video.reset (new VideoDecoder (this, c));
+ video = make_shared<VideoDecoder>(this, c);
}
+
bool
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()) {
/* 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_content->video->range()));
+ _image = make_shared<FFmpegImageProxy>(path);
}
}
return false;
}
+
void
ImageDecoder::seek (ContentTime time, bool accurate)
{