diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-05-23 12:52:49 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-05-23 12:52:49 +0100 |
| commit | 8c6fe8e1e8c8f6d5932606f2a5b6e1b87681ae38 (patch) | |
| tree | 07e1d5f76b0c5fcb614831e72d196dd814132e49 /src/lib/video_decoder.cc | |
| parent | e8819ad7580f25eea7ca3c59cf0a3979d76a6b44 (diff) | |
Various more hacks.
Diffstat (limited to 'src/lib/video_decoder.cc')
| -rw-r--r-- | src/lib/video_decoder.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc index 8bb7f3700..609594e76 100644 --- a/src/lib/video_decoder.cc +++ b/src/lib/video_decoder.cc @@ -33,7 +33,7 @@ VideoDecoder::VideoDecoder (shared_ptr<const Film> f, shared_ptr<const VideoCont : Decoder (f) , _next_video (0) , _video_content (c) - , _frame_rate_conversion (c->video_frame_rate(), f->dcp_frame_rate()) + , _frame_rate_conversion (c->video_frame_rate(), f->dcp_video_frame_rate()) , _odd (false) { @@ -59,11 +59,14 @@ VideoDecoder::video (shared_ptr<Image> image, bool same, Time t) Video (image, same, sub, t); + shared_ptr<const Film> film = _film.lock (); + assert (film); + if (_frame_rate_conversion.repeat) { - Video (image, true, sub, t + _film->video_frames_to_time (1)); - _next_video = t + _film->video_frames_to_time (2); + Video (image, true, sub, t + film->video_frames_to_time (1)); + _next_video = t + film->video_frames_to_time (2); } else { - _next_video = t + _film->video_frames_to_time (1); + _next_video = t + film->video_frames_to_time (1); } _odd = !_odd; |