projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master; fix crash on new film.
[dcpomatic.git]
/
src
/
lib
/
transcoder.h
diff --git
a/src/lib/transcoder.h
b/src/lib/transcoder.h
index f5b8ae6e329d3892735bf5d5a4d36f1615c44fc5..97ecaabfc2a54b9ff48ae7dd8d7640da59fd489c 100644
(file)
--- a/
src/lib/transcoder.h
+++ b/
src/lib/transcoder.h
@@
-18,27
+18,22
@@
*/
/** @file src/transcoder.h
*/
/** @file src/transcoder.h
- * @brief A class which takes a Film and some Options, then uses those to transcode the 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 Matcher;
class VideoFilter;
class Gain;
class Film;
class Job;
class Encoder;
class Matcher;
class VideoFilter;
class Gain;
-class VideoDecoder;
-class AudioDecoder;
class DelayLine;
class DelayLine;
+class Player;
class Trimmer;
/** @class Transcoder
class Trimmer;
/** @class Transcoder
- * @brief A class which takes a Film and some Options, then uses those to transcode the 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.
@@
-48,24
+43,19
@@
class Transcoder
public:
Transcoder (
boost::shared_ptr<Film> f,
public:
Transcoder (
boost::shared_ptr<Film> f,
- DecodeOptions o,
- Job* j,
- boost::shared_ptr<Encoder> e
+ 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;
protected:
/** A Job that is running this Transcoder, or 0 */
protected:
/** 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;
boost::shared_ptr<Matcher> _matcher;
boost::shared_ptr<DelayLine> _delay_line;
boost::shared_ptr<Gain> _gain;