diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-05-19 11:05:10 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-05-19 11:05:10 +0100 |
| commit | 9e758fddfb8bbadb1fc84e393daa815445d5e9d5 (patch) | |
| tree | 291005ebf01a66f07ab05b09e72f634ddd1ac45a /src/lib/video_decoder.cc | |
| parent | 362ed9ee4f73bee21b3ef8d3b449bb8e8877f501 (diff) | |
| parent | 69c08e8bbd5028a65cbddd2aa5f10632bd059191 (diff) | |
Merge delay-decode-take2 branch into master.
Diffstat (limited to 'src/lib/video_decoder.cc')
| -rw-r--r-- | src/lib/video_decoder.cc | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc index 2a33a8c3a..5867ac925 100644 --- a/src/lib/video_decoder.cc +++ b/src/lib/video_decoder.cc @@ -34,34 +34,28 @@ VideoDecoder::VideoDecoder (shared_ptr<const Film> f, shared_ptr<const VideoCont } void -VideoDecoder::video (shared_ptr<const Image> image, bool same, VideoContent::Frame frame) +VideoDecoder::video (shared_ptr<const ImageProxy> image, bool same, VideoContent::Frame frame) { switch (_video_content->video_frame_type ()) { case VIDEO_FRAME_TYPE_2D: - Video (image, EYES_BOTH, same, frame); + Video (image, EYES_BOTH, PART_WHOLE, same, frame); break; case VIDEO_FRAME_TYPE_3D_ALTERNATE: - Video (image, (frame % 2) ? EYES_RIGHT : EYES_LEFT, same, frame / 2); + Video (image, (frame % 2) ? EYES_RIGHT : EYES_LEFT, PART_WHOLE, same, frame / 2); break; case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT: - { - int const half = image->size().width / 2; - Video (image->crop (Crop (0, half, 0, 0), true), EYES_LEFT, same, frame); - Video (image->crop (Crop (half, 0, 0, 0), true), EYES_RIGHT, same, frame); + Video (image, EYES_LEFT, PART_LEFT_HALF, same, frame); + Video (image, EYES_RIGHT, PART_RIGHT_HALF, same, frame); break; - } case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM: - { - int const half = image->size().height / 2; - Video (image->crop (Crop (0, 0, 0, half), true), EYES_LEFT, same, frame); - Video (image->crop (Crop (0, 0, half, 0), true), EYES_RIGHT, same, frame); + Video (image, EYES_LEFT, PART_TOP_HALF, same, frame); + Video (image, EYES_RIGHT, PART_BOTTOM_HALF, same, frame); break; - } case VIDEO_FRAME_TYPE_3D_LEFT: - Video (image, EYES_LEFT, same, frame); + Video (image, EYES_LEFT, PART_WHOLE, same, frame); break; case VIDEO_FRAME_TYPE_3D_RIGHT: - Video (image, EYES_RIGHT, same, frame); + Video (image, EYES_RIGHT, PART_WHOLE, same, frame); break; } |