projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Basics of splitting up Decoder tree like Content.
[dcpomatic.git]
/
src
/
lib
/
decoder.h
diff --git
a/src/lib/decoder.h
b/src/lib/decoder.h
index c93069882af4b1d01c5f0d371b7ab92c74f96aa1..979c6cf582777766b867212a61cc67a7a174890f 100644
(file)
--- a/
src/lib/decoder.h
+++ b/
src/lib/decoder.h
@@
-26,11
+26,12
@@
#include "types.h"
#include "dcpomatic_time.h"
#include "types.h"
#include "dcpomatic_time.h"
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
#include <boost/utility.hpp>
class Decoded;
#include <boost/utility.hpp>
class Decoded;
+class VideoDecoder;
+class AudioDecoder;
+class SubtitleDecoder;
/** @class Decoder.
* @brief Parent class for decoders of content.
/** @class Decoder.
* @brief Parent class for decoders of content.
@@
-40,8
+41,15
@@
class Decoder : public boost::noncopyable
public:
virtual ~Decoder () {}
public:
virtual ~Decoder () {}
-protected:
- friend class AudioDecoderStream;
+ boost::shared_ptr<VideoDecoder> video;
+ boost::shared_ptr<AudioDecoder> audio;
+ boost::shared_ptr<SubtitleDecoder> subtitle;
+
+ enum PassReason {
+ PASS_REASON_VIDEO,
+ PASS_REASON_AUDIO,
+ PASS_REASON_SUBTITLE
+ };
/** Seek so that the next pass() will yield the next thing
* (video/sound frame, subtitle etc.) at or after the requested
/** Seek so that the next pass() will yield the next thing
* (video/sound frame, subtitle etc.) at or after the requested
@@
-53,7
+61,8
@@
protected:
*/
virtual void seek (ContentTime time, bool accurate) = 0;
*/
virtual void seek (ContentTime time, bool accurate) = 0;
- virtual bool pass () = 0;
+ /** @return true if this decoder has already returned all its data and will give no more */
+ virtual bool pass (PassReason, bool accurate) = 0;
};
#endif
};
#endif