summaryrefslogtreecommitdiff
path: root/src/lib/video_mxf_decoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-08-03 17:54:06 +0100
committerCarl Hetherington <cth@carlh.net>2017-08-14 21:07:49 +0100
commit0253b4e45c71a1c2e2a8bffaf1c3cb84a0a3e41a (patch)
tree85ca9af20c85ca04a221ca9023c0d2980ffeeca7 /src/lib/video_mxf_decoder.cc
parente952a7b0681d1ad2fc6ebcd0cd7231bf59bbe043 (diff)
Basics of forced reduction of JPEG2000 decode resolution.
Diffstat (limited to 'src/lib/video_mxf_decoder.cc')
-rw-r--r--src/lib/video_mxf_decoder.cc18
1 files changed, 14 insertions, 4 deletions
diff --git a/src/lib/video_mxf_decoder.cc b/src/lib/video_mxf_decoder.cc
index 216721375..194830c63 100644
--- a/src/lib/video_mxf_decoder.cc
+++ b/src/lib/video_mxf_decoder.cc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2016-2017 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
@@ -29,6 +29,7 @@
#include <dcp/exceptions.h>
using boost::shared_ptr;
+using boost::optional;
VideoMXFDecoder::VideoMXFDecoder (shared_ptr<const VideoMXFContent> content, shared_ptr<Log> log)
: _content (content)
@@ -78,14 +79,23 @@ VideoMXFDecoder::pass ()
if (_mono_reader) {
video->emit (
- shared_ptr<ImageProxy> (new J2KImageProxy (_mono_reader->get_frame(frame), _size, AV_PIX_FMT_XYZ12LE)), frame
+ shared_ptr<ImageProxy> (
+ new J2KImageProxy (_mono_reader->get_frame(frame), _size, AV_PIX_FMT_XYZ12LE, optional<int>())
+ ),
+ frame
);
} else {
video->emit (
- shared_ptr<ImageProxy> (new J2KImageProxy (_stereo_reader->get_frame(frame), _size, dcp::EYE_LEFT, AV_PIX_FMT_XYZ12LE)), frame
+ shared_ptr<ImageProxy> (
+ new J2KImageProxy (_stereo_reader->get_frame(frame), _size, dcp::EYE_LEFT, AV_PIX_FMT_XYZ12LE, optional<int>())
+ ),
+ frame
);
video->emit (
- shared_ptr<ImageProxy> (new J2KImageProxy (_stereo_reader->get_frame(frame), _size, dcp::EYE_RIGHT, AV_PIX_FMT_XYZ12LE)), frame
+ shared_ptr<ImageProxy> (
+ new J2KImageProxy (_stereo_reader->get_frame(frame), _size, dcp::EYE_RIGHT, AV_PIX_FMT_XYZ12LE, optional<int>())
+ ),
+ frame
);
}