projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use dcp::file_to_string().
[dcpomatic.git]
/
src
/
lib
/
video_decoder.cc
diff --git
a/src/lib/video_decoder.cc
b/src/lib/video_decoder.cc
index 215024e29b04d0179a0b8aeea5e7f9d076d1911e..ce42f428f6711c460bc37632cf26418796f990c6 100644
(file)
--- a/
src/lib/video_decoder.cc
+++ b/
src/lib/video_decoder.cc
@@
-115,7
+115,7
@@
VideoDecoder::emit (shared_ptr<const Film> film, shared_ptr<const ImageProxy> im
frame = decoder_frame;
if (vft == VideoFrameType::THREE_D) {
auto j2k = dynamic_pointer_cast<const J2KImageProxy>(image);
frame = decoder_frame;
if (vft == VideoFrameType::THREE_D) {
auto j2k = dynamic_pointer_cast<const J2KImageProxy>(image);
- /* At the moment only DCP decoders producers VideoFrameType::THREE_D, so only the J2KImagProxy
+ /* At the moment only DCP decoders producers VideoFrameType::THREE_D, so only the J2KImag
e
Proxy
* knows which eye it is.
*/
if (j2k && j2k->eye()) {
* knows which eye it is.
*/
if (j2k && j2k->eye()) {
@@
-136,6
+136,9
@@
VideoDecoder::emit (shared_ptr<const Film> film, shared_ptr<const ImageProxy> im
frame = _position->frames_round(afr);
eyes = Eyes::RIGHT;
}
frame = _position->frames_round(afr);
eyes = Eyes::RIGHT;
}
+ } else {
+ /* This should not happen; see above */
+ frame = _position->frames_round(afr) + 1;
}
} else if (vft == VideoFrameType::THREE_D_ALTERNATE) {
DCPOMATIC_ASSERT (_last_emitted_eyes);
}
} else if (vft == VideoFrameType::THREE_D_ALTERNATE) {
DCPOMATIC_ASSERT (_last_emitted_eyes);