- /* Create a PlayerVideo from the content's video at this time */
-
- shared_ptr<Piece> piece = ov.back ();
- shared_ptr<VideoDecoder> decoder = dynamic_pointer_cast<VideoDecoder> (piece->decoder);
- assert (decoder);
- shared_ptr<VideoContent> content = dynamic_pointer_cast<VideoContent> (piece->content);
- assert (content);
-
- list<ContentVideo> content_video = decoder->get_video (dcp_to_content_video (piece, time), accurate);
- if (content_video.empty ()) {
- pvf.push_back (black_player_video_frame (time));
- return pvf;
- }
-
- dcp::Size image_size = content->scale().size (content, _video_container_size, _film->frame_size (), _approximate_size ? 4 : 1);
- if (_approximate_size) {
- image_size.width &= ~3;
- image_size.height &= ~3;
- }
-
- for (list<ContentVideo>::const_iterator i = content_video.begin(); i != content_video.end(); ++i) {
- pvf.push_back (
- shared_ptr<PlayerVideo> (
- new PlayerVideo (
- i->image,
- content_video_to_dcp (piece, i->frame),
- content->crop (),
- content->fade (i->frame),
- image_size,
- _video_container_size,
- _film->scaler(),
- i->eyes,
- i->part,
- content->colour_conversion ()
- )
- )
- );
+ /* Some video content at this time */
+ shared_ptr<Piece> last = *(ov.rbegin ());
+ VideoFrameType const last_type = dynamic_pointer_cast<VideoContent> (last->content)->video_frame_type ();
+
+ /* Get video from appropriate piece(s) */
+ BOOST_FOREACH (shared_ptr<Piece> piece, ov) {
+
+ shared_ptr<VideoDecoder> decoder = dynamic_pointer_cast<VideoDecoder> (piece->decoder);
+ DCPOMATIC_ASSERT (decoder);
+ shared_ptr<VideoContent> video_content = dynamic_pointer_cast<VideoContent> (piece->content);
+ DCPOMATIC_ASSERT (video_content);
+
+ bool const use =
+ /* always use the last video */
+ piece == last ||
+ /* with a corresponding L/R eye if appropriate */
+ (last_type == VIDEO_FRAME_TYPE_3D_LEFT && video_content->video_frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) ||
+ (last_type == VIDEO_FRAME_TYPE_3D_RIGHT && video_content->video_frame_type() == VIDEO_FRAME_TYPE_3D_LEFT);
+
+ if (use) {
+ /* We want to use this piece */
+ list<ContentVideo> content_video = decoder->get_video (dcp_to_content_video (piece, time), accurate);
+ if (content_video.empty ()) {
+ pvf.push_back (black_player_video_frame (time));
+ } else {
+ dcp::Size image_size = video_content->scale().size (video_content, _video_container_size, _film->frame_size ());
+
+ for (list<ContentVideo>::const_iterator i = content_video.begin(); i != content_video.end(); ++i) {
+ pvf.push_back (
+ shared_ptr<PlayerVideo> (
+ new PlayerVideo (
+ i->image,
+ content_video_to_dcp (piece, i->frame),
+ video_content->crop (),
+ video_content->fade (i->frame),
+ image_size,
+ _video_container_size,
+ i->eyes,
+ i->part,
+ video_content->colour_conversion ()
+ )
+ )
+ );
+ }
+ }
+ } else {
+ /* Discard unused video */
+ decoder->get_video (dcp_to_content_video (piece, time), accurate);
+ }