diff options
Diffstat (limited to 'src/lib/decoder.h')
| -rw-r--r-- | src/lib/decoder.h | 33 |
1 files changed, 25 insertions, 8 deletions
diff --git a/src/lib/decoder.h b/src/lib/decoder.h index d67592ed8..0f14dbba7 100644 --- a/src/lib/decoder.h +++ b/src/lib/decoder.h @@ -27,8 +27,10 @@ #include <boost/shared_ptr.hpp> #include <boost/weak_ptr.hpp> #include <boost/utility.hpp> +#include "types.h" +#include "dcpomatic_time.h" -class Film; +class Decoded; /** @class Decoder. * @brief Parent class for decoders of content. @@ -36,21 +38,36 @@ class Film; class Decoder : public boost::noncopyable { public: - Decoder (boost::shared_ptr<const Film>); + Decoder (); virtual ~Decoder () {} - /** Perform one decode pass of the content, which may or may not - * cause the object to emit some data. + /** 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. + */ + 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(). */ - virtual void pass () = 0; - virtual bool done () const = 0; + 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 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). + */ + virtual bool pass () = 0; virtual void flush () {}; - /** The Film that we are decoding in */ - boost::weak_ptr<const Film> _film; + std::list<boost::shared_ptr<Decoded> > _pending; + bool _done; }; #endif |