diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-07-09 10:17:49 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-07-09 10:17:49 +0100 |
| commit | 0dc52cd6e69890cd8a2c539e80389ea8bac5cc3c (patch) | |
| tree | 0dbf929df2936893ce4ba952fffc54e2c1303f37 /src/lib/dcp_decoder.cc | |
| parent | 2cf3da72a017eebf741dfb9a5ec158df94a4e7b7 (diff) | |
Fix DCP name in editor; fix use of DCP entry points.
Diffstat (limited to 'src/lib/dcp_decoder.cc')
| -rw-r--r-- | src/lib/dcp_decoder.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc index 14672a23b..1939fc1c9 100644 --- a/src/lib/dcp_decoder.cc +++ b/src/lib/dcp_decoder.cc @@ -62,20 +62,21 @@ DCPDecoder::pass () shared_ptr<dcp::PictureMXF> mxf = (*_reel)->main_picture()->mxf (); shared_ptr<dcp::MonoPictureMXF> mono = dynamic_pointer_cast<dcp::MonoPictureMXF> (mxf); shared_ptr<dcp::StereoPictureMXF> stereo = dynamic_pointer_cast<dcp::StereoPictureMXF> (mxf); + int64_t const ep = (*_reel)->main_picture()->entry_point (); if (mono) { shared_ptr<Image> image (new Image (PIX_FMT_RGB24, mxf->size(), false)); - mono->get_frame (_next.frames (vfr))->rgb_frame (image->data()[0]); + mono->get_frame (ep + _next.frames (vfr))->rgb_frame (image->data()[0]); shared_ptr<Image> aligned (new Image (image, true)); video (shared_ptr<ImageProxy> (new RawImageProxy (aligned, _log)), _next.frames (vfr)); } else { shared_ptr<Image> left (new Image (PIX_FMT_RGB24, mxf->size(), false)); - stereo->get_frame (_next.frames (vfr))->rgb_frame (dcp::EYE_LEFT, left->data()[0]); + stereo->get_frame (ep + _next.frames (vfr))->rgb_frame (dcp::EYE_LEFT, left->data()[0]); shared_ptr<Image> aligned_left (new Image (left, true)); video (shared_ptr<ImageProxy> (new RawImageProxy (aligned_left, _log)), _next.frames (vfr)); shared_ptr<Image> right (new Image (PIX_FMT_RGB24, mxf->size(), false)); - stereo->get_frame (_next.frames (vfr))->rgb_frame (dcp::EYE_RIGHT, right->data()[0]); + stereo->get_frame (ep + _next.frames (vfr))->rgb_frame (dcp::EYE_RIGHT, right->data()[0]); shared_ptr<Image> aligned_right (new Image (right, true)); video (shared_ptr<ImageProxy> (new RawImageProxy (aligned_right, _log)), _next.frames (vfr)); } |