summaryrefslogtreecommitdiff
path: root/src/lib/decoder.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-02-25 12:10:27 +0000
committerCarl Hetherington <cth@carlh.net>2014-02-25 12:10:27 +0000
commite15fa4fe6d519c92f2083ca42c18675c729bda30 (patch)
tree70813871a8219b00d5bd0fb8409ee1aa8aad2929 /src/lib/decoder.h
parent751d212a973c3ce80a6664fec929801301db6349 (diff)
Somewhat riskily remove use of AV_SEEK_BACKWARD. It was causing
seeks at the end of a FFmpegDecoder to go back into the content, confusing the player (which assumes that the next peek after seek will be after the seek location).
Diffstat (limited to 'src/lib/decoder.h')
-rw-r--r--src/lib/decoder.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 6646b0e76..562073c1e 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -41,7 +41,7 @@ public:
Decoder (boost::shared_ptr<const Film>);
virtual ~Decoder () {}
- /** Seek so that the next get_*() will yield the next thing
+ /** Seek so that the next peek() will yield the next thing
* (video/sound frame, subtitle etc.) at or after the requested
* time. Pass accurate = true to try harder to get close to
* the request.
@@ -49,13 +49,17 @@ public:
virtual void seek (ContentTime time, bool accurate);
boost::shared_ptr<Decoded> peek ();
+
+ /* Consume the last peek()ed thing so that it won't be returned
+ * from the next peek().
+ */
void consume ();
protected:
/** Perform one decode pass of the content, which may or may not
* result in a complete quantum (Decoded object) of decoded stuff
- * being made ready.
+ * being added to _pending.
* @return true if the decoder is done (i.e. no more data will be
* produced by any future calls to pass() without a seek() first).
*/