projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '1.0' of ssh://carlh.dnsalias.org/home/carl/git/dvdomatic into 1.0
[dcpomatic.git]
/
src
/
lib
/
transcoder.h
diff --git
a/src/lib/transcoder.h
b/src/lib/transcoder.h
index 786010869d35bb04f4528b3827601a62983a3a42..007065b658cd7240f15001f1361f549aa1378493 100644
(file)
--- a/
src/lib/transcoder.h
+++ b/
src/lib/transcoder.h
@@
-17,56
+17,41
@@
*/
*/
+#include "types.h"
+
/** @file src/transcoder.h
/** @file src/transcoder.h
- * @brief A class which takes a FilmState and some Options, then uses those to transcode a Film.
*
* A decoder is selected according to the content type, and the encoder can be specified
* as a parameter to the constructor.
*/
*
* A decoder is selected according to the content type, and the encoder can be specified
* as a parameter to the constructor.
*/
-#include "decoder_factory.h"
-
class Film;
class Job;
class Encoder;
class Film;
class Job;
class Encoder;
-class FilmState;
-class Matcher;
class VideoFilter;
class VideoFilter;
-class Gain;
-class VideoDecoder;
-class AudioDecoder;
-class DelayLine;
+class Player;
/** @class Transcoder
/** @class Transcoder
- * @brief A class which takes a FilmState and some Options, then uses those to transcode a Film.
*
* A decoder is selected according to the content type, and the encoder can be specified
* as a parameter to the constructor.
*/
*
* A decoder is selected according to the content type, and the encoder can be specified
* as a parameter to the constructor.
*/
-class Transcoder
+class Transcoder
: public boost::noncopyable
{
public:
Transcoder (
{
public:
Transcoder (
- boost::shared_ptr<Film> f,
- DecodeOptions o,
- Job* j,
- boost::shared_ptr<Encoder> e
+ boost::shared_ptr<const Film> f,
+ boost::shared_ptr<Job> j
);
void go ();
);
void go ();
- boost::shared_ptr<VideoDecoder> video_decoder () const {
- return _decoders.video;
- }
+ float current_encoding_rate () const;
+ int video_frames_out () const;
-pr
otected
:
+pr
ivate
:
/** A Job that is running this Transcoder, or 0 */
/** A Job that is running this Transcoder, or 0 */
-
Job*
_job;
- /** The encoder that we will use */
+
boost::shared_ptr<Job>
_job;
+ boost::shared_ptr<Player> _player;
boost::shared_ptr<Encoder> _encoder;
boost::shared_ptr<Encoder> _encoder;
- /** The decoders that we will use */
- Decoders _decoders;
- boost::shared_ptr<Matcher> _matcher;
- boost::shared_ptr<DelayLine> _delay_line;
- boost::shared_ptr<Gain> _gain;
};
};