diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-12-13 10:23:20 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-12-13 10:23:20 +0000 |
| commit | da19eaac0dd80afed3dd282d61ea3298196a5090 (patch) | |
| tree | 8b6caca26fc79aa943082965e7aac72ae6dcc521 /src/lib/video_decoder.cc | |
| parent | 097a1fb413bbbb89182161d4c1a31daa5419ec96 (diff) | |
Start of changing frame numbers to time.
Diffstat (limited to 'src/lib/video_decoder.cc')
| -rw-r--r-- | src/lib/video_decoder.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc index eaa4534e4..72caf72e9 100644 --- a/src/lib/video_decoder.cc +++ b/src/lib/video_decoder.cc @@ -28,27 +28,24 @@ using boost::shared_ptr; VideoDecoder::VideoDecoder (shared_ptr<const Film> f, shared_ptr<const VideoContent> c) : Decoder (f) , _video_content (c) - , _video_position (0) { } void -VideoDecoder::video (shared_ptr<const Image> image, bool same, VideoContent::Frame frame) +VideoDecoder::video (shared_ptr<const Image> image, bool same, ContentTime time) { switch (_video_content->video_frame_type ()) { case VIDEO_FRAME_TYPE_2D: - Video (image, EYES_BOTH, same, frame); + Video (image, EYES_BOTH, same, time); 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->crop (Crop (0, half, 0, 0), true), EYES_LEFT, same, time); + Video (image->crop (Crop (half, 0, 0, 0), true), EYES_RIGHT, same, time); break; } } - - _video_position = frame + 1; } |