summaryrefslogtreecommitdiff
path: root/src/lib/video_decoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-12-08 11:23:58 +0000
committerCarl Hetherington <cth@carlh.net>2016-12-08 11:23:58 +0000
commita28ef704adf8c5bfa45b3d6285f741af64758ceb (patch)
tree04c1afa7b6a72f7faabe290d14713d242b867ab1 /src/lib/video_decoder.cc
parent804f43474bba7008bf68fc9189793c89c512a944 (diff)
Further fixes and tidying to 'better-seek'.
This fixes the failure to keep track of the `position' of each stream of a multi-stream file. It also tidies things up a bit.
Diffstat (limited to 'src/lib/video_decoder.cc')
-rw-r--r--src/lib/video_decoder.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index 1cde53e81..0e9ee0c1a 100644
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -274,6 +274,7 @@ VideoDecoder::give (shared_ptr<const ImageProxy> image, Frame frame)
}
_log->log (String::compose ("VD receives %1", frame), LogEntry::TYPE_DEBUG_DECODE);
+ _position = ContentTime::from_frames (frame, _content->active_video_frame_rate());
/* Work out what we are going to push into _decoded next */
list<ContentVideo> to_push;
@@ -389,4 +390,5 @@ VideoDecoder::seek (ContentTime s, bool accurate)
_decoded.clear ();
_last_seek_time = s;
_last_seek_accurate = accurate;
+ _position.reset ();
}