projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Missing include for older gcc.
[dcpomatic.git]
/
src
/
lib
/
transcoder.h
diff --git
a/src/lib/transcoder.h
b/src/lib/transcoder.h
index 79ef89a18ad25a38c4b1cacce0228caa934b2b32..b50113742369c817aa3e0b57d28158f31d111b41 100644
(file)
--- a/
src/lib/transcoder.h
+++ b/
src/lib/transcoder.h
@@
-17,8
+17,6
@@
*/
*/
-#include "decoder.h"
-
/** @file src/transcoder.h
* @brief A class which takes a FilmState and some Options, then uses those to transcode a Film.
*
/** @file src/transcoder.h
* @brief A class which takes a FilmState and some Options, then uses those to transcode a Film.
*
@@
-26,10
+24,20
@@
* as a parameter to the constructor.
*/
* as a parameter to the constructor.
*/
+#include "decoder_factory.h"
+
class Film;
class Job;
class Encoder;
class FilmState;
class Film;
class Job;
class Encoder;
class FilmState;
+class Matcher;
+class VideoFilter;
+class Gain;
+class VideoDecoder;
+class AudioDecoder;
+class DelayLine;
+class EncodeOptions;
+class DecodeOptions;
/** @class Transcoder
* @brief A class which takes a FilmState and some Options, then uses those to transcode a Film.
/** @class Transcoder
* @brief A class which takes a FilmState and some Options, then uses those to transcode a Film.
@@
-40,13
+48,17
@@
class FilmState;
class Transcoder
{
public:
class Transcoder
{
public:
- Transcoder (boost::shared_ptr<Film> f, boost::shared_ptr<const Options> o, Job* j, boost::shared_ptr<Encoder> e);
+ Transcoder (
+ boost::shared_ptr<Film> f,
+ boost::shared_ptr<const DecodeOptions> o,
+ Job* j,
+ boost::shared_ptr<Encoder> e
+ );
void go ();
void go ();
- /** @return Our decoder */
- boost::shared_ptr<Decoder> decoder () {
- return _decoder;
+ boost::shared_ptr<VideoDecoder> video_decoder () const {
+ return _decoders.video;
}
protected:
}
protected:
@@
-54,6
+66,9
@@
protected:
Job* _job;
/** The encoder that we will use */
boost::shared_ptr<Encoder> _encoder;
Job* _job;
/** The encoder that we will use */
boost::shared_ptr<Encoder> _encoder;
- /** The decoder that we will use */
- boost::shared_ptr<Decoder> _decoder;
+ /** The decoders that we will use */
+ Decoders _decoders;
+ boost::shared_ptr<Matcher> _matcher;
+ boost::shared_ptr<DelayLine> _delay_line;
+ boost::shared_ptr<Gain> _gain;
};
};