From e15fa4fe6d519c92f2083ca42c18675c729bda30 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 25 Feb 2014 12:10:27 +0000 Subject: 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). --- src/lib/decoder.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/lib/decoder.h') 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); 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 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). */ -- cgit v1.2.3