diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-06-13 16:09:07 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-06-13 16:09:07 +0100 |
| commit | cd29c4ed26fde9b9c07190f92205705b13c6bd73 (patch) | |
| tree | b90771925ef9d92faaf1d1fce574f30cfe5be2bc /src/lib/video_decoder.h | |
| parent | 78012b8cf9b4c6e35b425c97b6432551ce635c3a (diff) | |
Fix VideoDecoder::get_video() with 3D.
get_video() promises to return all video frames at the given time,
but this wasn't working for none-SBS-3D as it would be satisfied
when it got the first (left) frame. Adjust get_video() to get all
required frames.
This showed up bugs in fill_both_eyes, whereby the from parameter
was ignored and the wrong things were done in some cases;
video_decoder_fill_test.cc tests this stuff.
Diffstat (limited to 'src/lib/video_decoder.h')
| -rw-r--r-- | src/lib/video_decoder.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h index 5053d32eb..7c2374dd8 100644 --- a/src/lib/video_decoder.h +++ b/src/lib/video_decoder.h @@ -68,7 +68,7 @@ private: std::list<ContentVideo> decoded (Frame frame); void fill_one_eye (Frame from, Frame to, Eyes); - void fill_both_eyes (Frame from, Frame to, Eyes); + void fill_both_eyes (Frame from_frame, Eyes from_eyes, Frame to_frame, Eyes to_eyes); Decoder* _parent; boost::shared_ptr<const Content> _content; |