projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix checking of frame channels vs stream channels.
[dcpomatic.git]
/
src
/
lib
/
image_decoder.cc
diff --git
a/src/lib/image_decoder.cc
b/src/lib/image_decoder.cc
index a9e473f25e52e500d807d59a4a662552c28c4a7c..59dc4e873fd92fcaa5a0723351b6fda862ff51ad 100644
(file)
--- a/
src/lib/image_decoder.cc
+++ b/
src/lib/image_decoder.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-20
16
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,32
+18,38
@@
*/
*/
+
+#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 "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 "j2k_image_proxy.h"
-#include "film.h"
-#include "exceptions.h"
#include "video_content.h"
#include "video_content.h"
+#include "video_decoder.h"
#include <boost/filesystem.hpp>
#include <iostream>
#include "i18n.h"
#include <boost/filesystem.hpp>
#include <iostream>
#include "i18n.h"
+
using std::cout;
using std::cout;
-using boost::shared_ptr;
+using std::make_shared;
+using std::shared_ptr;
using dcp::Size;
using dcp::Size;
+using namespace dcpomatic;
+
ImageDecoder::ImageDecoder (shared_ptr<const Film> film, shared_ptr<const ImageContent> c)
: Decoder (film)
, _image_content (c)
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 ()
{
bool
ImageDecoder::pass ()
{
@@
-53,7
+59,7
@@
ImageDecoder::pass ()
if (!_image_content->still() || !_image) {
/* Either we need an image or we are using moving images, so load one */
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()) {
if (valid_j2k_file (path)) {
AVPixelFormat pf;
if (_image_content->video->colour_conversion()) {
@@
-66,9
+72,9
@@
ImageDecoder::pass ()
/* We can't extract image size from a JPEG2000 codestream without decoding it,
so pass in the image content's size here.
*/
/* 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 {
} else {
- _image
.reset (new FFmpegImageProxy (path)
);
+ _image
= make_shared<FFmpegImageProxy>(path
);
}
}
}
}
@@
-77,10
+83,10
@@
ImageDecoder::pass ()
return false;
}
return false;
}
+
void
ImageDecoder::seek (ContentTime time, bool accurate)
{
void
ImageDecoder::seek (ContentTime time, bool accurate)
{
- Decoder::seek (
- time, accurate);
+ Decoder::seek (time, accurate);
_frame_video_position = time.frames_round (_image_content->active_video_frame_rate(film()));
}
_frame_video_position = time.frames_round (_image_content->active_video_frame_rate(film()));
}