diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-11-07 22:33:52 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-11-07 22:33:52 +0000 |
| commit | 985a83ffbf251db481150221914ef74fbfe549b2 (patch) | |
| tree | 5de2be442f41d3117102011c4ef92e375b0f0e25 /src/lib/dcp_decoder.cc | |
| parent | 8e4f48a96af091e7d90387aa027d65ac285a8201 (diff) | |
| parent | 87da92b45a9a0cf4ce809ea580a78c4dd5d96021 (diff) | |
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
Diffstat (limited to 'src/lib/dcp_decoder.cc')
| -rw-r--r-- | src/lib/dcp_decoder.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc index bf016ef87..adeadd98a 100644 --- a/src/lib/dcp_decoder.cc +++ b/src/lib/dcp_decoder.cc @@ -38,11 +38,10 @@ using std::cout; using boost::shared_ptr; using boost::dynamic_pointer_cast; -DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> c, shared_ptr<Log> log) +DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> c) : VideoDecoder (c) , AudioDecoder (c) , SubtitleDecoder (c) - , _log (log) , _dcp_content (c) { dcp::DCP dcp (c->directory ()); @@ -71,15 +70,15 @@ DCPDecoder::pass () shared_ptr<dcp::StereoPictureMXF> stereo = dynamic_pointer_cast<dcp::StereoPictureMXF> (mxf); int64_t const entry_point = (*_reel)->main_picture()->entry_point (); if (mono) { - video (shared_ptr<ImageProxy> (new J2KImageProxy (mono->get_frame (entry_point + frame), mxf->size(), _log)), frame); + video (shared_ptr<ImageProxy> (new J2KImageProxy (mono->get_frame (entry_point + frame), mxf->size())), frame); } else { video ( - shared_ptr<ImageProxy> (new J2KImageProxy (stereo->get_frame (entry_point + frame), mxf->size(), dcp::EYE_LEFT, _log)), + shared_ptr<ImageProxy> (new J2KImageProxy (stereo->get_frame (entry_point + frame), mxf->size(), dcp::EYE_LEFT)), frame ); video ( - shared_ptr<ImageProxy> (new J2KImageProxy (stereo->get_frame (entry_point + frame), mxf->size(), dcp::EYE_RIGHT, _log)), + shared_ptr<ImageProxy> (new J2KImageProxy (stereo->get_frame (entry_point + frame), mxf->size(), dcp::EYE_RIGHT)), frame ); } |