X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder.h;h=c93069882af4b1d01c5f0d371b7ab92c74f96aa1;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=df3ac4f39c4a734b9c433673e36ff2500b50d774;hpb=854f2e5bbb7ffb9758b823af87034033033f3cb8;p=dcpomatic.git diff --git a/src/lib/decoder.h b/src/lib/decoder.h index df3ac4f39..c93069882 100644 --- a/src/lib/decoder.h +++ b/src/lib/decoder.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2013 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,20 +18,19 @@ */ /** @file src/decoder.h - * @brief Parent class for decoders of content. + * @brief Decoder class. */ #ifndef DCPOMATIC_DECODER_H #define DCPOMATIC_DECODER_H +#include "types.h" +#include "dcpomatic_time.h" #include #include #include -#include "types.h" -#include "dcpomatic_time.h" class Decoded; -class Film; /** @class Decoder. * @brief Parent class for decoders of content. @@ -41,13 +40,19 @@ class Decoder : public boost::noncopyable public: virtual ~Decoder () {} -protected: - /** Seek so that the next peek() will yield the next thing +protected: + friend class AudioDecoderStream; + + /** Seek so that the next pass() 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. + * time. Pass accurate = true to try harder to ensure that, at worst, + * the next thing we yield comes before `time'. This may entail + * seeking some way before `time' to be on the safe side. + * Alternatively, if seeking is 100% accurate for this decoder, + * it may seek to just the right spot. */ virtual void seek (ContentTime time, bool accurate) = 0; + virtual bool pass () = 0; };