diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-02-21 23:50:30 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-04-19 23:04:32 +0100 |
| commit | 130577d2e4e67de15ac8f5d6447729736d4bcac6 (patch) | |
| tree | baa5d6cee0ad1ccab254cae5149807e90d64aca2 /src/lib/video_decoder.cc | |
| parent | 45d5a5004a49edabbc96cd1acba12e08d31510f1 (diff) | |
Remove unnecessary VideoFrame class.
Diffstat (limited to 'src/lib/video_decoder.cc')
| -rw-r--r-- | src/lib/video_decoder.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc index 8a8a45747..9afbd31c4 100644 --- a/src/lib/video_decoder.cc +++ b/src/lib/video_decoder.cc @@ -62,7 +62,7 @@ VideoDecoder::emit (shared_ptr<const ImageProxy> image, Frame frame) /* Work out what we are going to emit next */ switch (_content->video->frame_type ()) { case VIDEO_FRAME_TYPE_2D: - Data (ContentVideo (image, VideoFrame (frame, EYES_BOTH), PART_WHOLE)); + Data (ContentVideo (image, frame, EYES_BOTH, PART_WHOLE)); break; case VIDEO_FRAME_TYPE_3D: { @@ -70,26 +70,26 @@ VideoDecoder::emit (shared_ptr<const ImageProxy> image, Frame frame) frame this one is. */ bool const same = (_last_emitted && _last_emitted.get() == frame); - Data (ContentVideo (image, VideoFrame (frame, same ? EYES_RIGHT : EYES_LEFT), PART_WHOLE)); + Data (ContentVideo (image, frame, same ? EYES_RIGHT : EYES_LEFT, PART_WHOLE)); _last_emitted = frame; break; } case VIDEO_FRAME_TYPE_3D_ALTERNATE: - Data (ContentVideo (image, VideoFrame (frame / 2, (frame % 2) ? EYES_RIGHT : EYES_LEFT), PART_WHOLE)); + Data (ContentVideo (image, frame / 2, (frame % 2) ? EYES_RIGHT : EYES_LEFT, PART_WHOLE)); break; case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT: - Data (ContentVideo (image, VideoFrame (frame, EYES_LEFT), PART_LEFT_HALF)); - Data (ContentVideo (image, VideoFrame (frame, EYES_RIGHT), PART_RIGHT_HALF)); + Data (ContentVideo (image, frame, EYES_LEFT, PART_LEFT_HALF)); + Data (ContentVideo (image, frame, EYES_RIGHT, PART_RIGHT_HALF)); break; case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM: - Data (ContentVideo (image, VideoFrame (frame, EYES_LEFT), PART_TOP_HALF)); - Data (ContentVideo (image, VideoFrame (frame, EYES_RIGHT), PART_BOTTOM_HALF)); + Data (ContentVideo (image, frame, EYES_LEFT, PART_TOP_HALF)); + Data (ContentVideo (image, frame, EYES_RIGHT, PART_BOTTOM_HALF)); break; case VIDEO_FRAME_TYPE_3D_LEFT: - Data (ContentVideo (image, VideoFrame (frame, EYES_LEFT), PART_WHOLE)); + Data (ContentVideo (image, frame, EYES_LEFT, PART_WHOLE)); break; case VIDEO_FRAME_TYPE_3D_RIGHT: - Data (ContentVideo (image, VideoFrame (frame, EYES_RIGHT), PART_WHOLE)); + Data (ContentVideo (image, frame, EYES_RIGHT, PART_WHOLE)); break; default: DCPOMATIC_ASSERT (false); |