- /* Any frame(s) will do: use the first one(s) that comes out of pass() */
- while (_decoded.size() < frames_wanted && !_parent->pass (Decoder::PASS_REASON_VIDEO, accurate)) {}
- list<ContentVideo>::const_iterator i = _decoded.begin();
- unsigned int j = 0;
- while (i != _decoded.end() && j < frames_wanted) {
- dec.push_back (*i);
- ++i;
- ++j;
- }
- }
-
- /* Clean up _decoded; keep the frame we are returning, if any (which may have two images
- for 3D), but nothing before that
- */
- while (!_decoded.empty() && !dec.empty() && _decoded.front().frame.index() < dec.front().frame.index()) {
- _log->log (String::compose ("VD discards %1", _decoded.front().frame.index()), LogEntry::TYPE_DEBUG_DECODE);
- _decoded.pop_front ();
- }
-
- return dec;
-}
-
-/** Fill _decoded from `from' up to, but not including, `to' with
- * a frame for one particular Eyes value (which could be EYES_BOTH,
- * EYES_LEFT or EYES_RIGHT)
- */
-void
-VideoDecoder::fill_one_eye (Frame from, Frame to, Eyes eye)
-{
- if (to == 0) {
- /* Already OK */
- return;
- }
-
- /* Fill with black... */
- shared_ptr<const ImageProxy> filler_image (new RawImageProxy (_black_image));
- Part filler_part = PART_WHOLE;
-
- /* ...unless there's some video we can fill with */
- if (!_decoded.empty ()) {
- filler_image = _decoded.back().image;
- filler_part = _decoded.back().part;
- }
-
- for (Frame i = from; i < to; ++i) {
-#ifdef DCPOMATIC_DEBUG
- test_gaps++;
-#endif
- _decoded.push_back (
- ContentVideo (filler_image, VideoFrame (i, eye), filler_part)
- );
- }
-}
-
-/** Fill _decoded from `from' up to, but not including, `to'
- * adding both left and right eye frames.
- */
-void
-VideoDecoder::fill_both_eyes (VideoFrame from, VideoFrame to)
-{
- /* Fill with black... */
- shared_ptr<const ImageProxy> filler_left_image (new RawImageProxy (_black_image));
- shared_ptr<const ImageProxy> filler_right_image (new RawImageProxy (_black_image));
- Part filler_left_part = PART_WHOLE;
- Part filler_right_part = PART_WHOLE;
-
- /* ...unless there's some video we can fill with */
- for (list<ContentVideo>::const_reverse_iterator i = _decoded.rbegin(); i != _decoded.rend(); ++i) {
- if (i->frame.eyes() == EYES_LEFT && !filler_left_image) {
- filler_left_image = i->image;
- filler_left_part = i->part;
- } else if (i->frame.eyes() == EYES_RIGHT && !filler_right_image) {
- filler_right_image = i->image;
- filler_right_part = i->part;
- }
-
- if (filler_left_image && filler_right_image) {
- break;
+ if (vft == VideoFrameType::THREE_D) {
+ auto j2k = dynamic_pointer_cast<const J2KImageProxy>(image);
+ if (j2k && j2k->eye()) {
+ if (j2k->eye() == dcp::Eye::LEFT) {
+ frame = _position->frames_round(afr) + 1;
+ eyes = Eyes::LEFT;
+ } else {
+ 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);
+ if (_last_emitted_eyes.get() == Eyes::RIGHT) {
+ frame = _position->frames_round(afr) + 1;
+ eyes = Eyes::LEFT;
+ } else {
+ frame = _position->frames_round(afr);
+ eyes = Eyes::RIGHT;
+ }
+ } else {
+ frame = _position->frames_round(afr) + 1;