diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-12-18 21:13:10 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-12-18 21:13:10 +0000 |
| commit | 0330d9b2924767d9240c5a25e9ed4327eb0a73bd (patch) | |
| tree | c0041d4d64b6cc6b1dc57fd12e23b5ca552197c1 /src/lib/imagemagick_decoder.cc | |
| parent | 880719c0bf2f2ce99ca44a5f5289fdd30962246a (diff) | |
Try to tidy up subtitle timing and seeks wrt source frames, DCP frames and rounding.
Diffstat (limited to 'src/lib/imagemagick_decoder.cc')
| -rw-r--r-- | src/lib/imagemagick_decoder.cc | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc index 5713e68f9..131eaa500 100644 --- a/src/lib/imagemagick_decoder.cc +++ b/src/lib/imagemagick_decoder.cc @@ -108,8 +108,22 @@ ImageMagickDecoder::pixel_format () const } bool -ImageMagickDecoder::seek (SourceFrame f) +ImageMagickDecoder::seek_to_last () { + if (_iter == _files.end()) { + _iter = _files.begin(); + } else { + --_iter; + } + + return false; +} + +bool +ImageMagickDecoder::seek (double t) +{ + int const f = t * frames_per_second(); + _iter = _files.begin (); for (int i = 0; i < f; ++i) { if (_iter == _files.end()) { |
