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 e3ca2bb32085b128bb0c47673bcab7b55fed804a..97ecaabfc2a54b9ff48ae7dd8d7640da59fd489c 100644
(file)
--- a/
src/lib/transcoder.h
+++ b/
src/lib/transcoder.h
@@
-18,7
+18,6
@@
*/
/** @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.
@@
-27,17
+26,14
@@
class Film;
class Job;
class Encoder;
class Film;
class Job;
class Encoder;
-class FilmState;
class Matcher;
class VideoFilter;
class Gain;
class Matcher;
class VideoFilter;
class Gain;
-class VideoDecoder;
-class AudioDecoder;
class DelayLine;
class DelayLine;
-class Options;
+class Player;
+class Trimmer;
/** @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.
@@
-45,18
+41,23
@@
class Options;
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<Job> j
+ );
void go ();
void go ();
+ 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 */
- std::pair<boost::shared_ptr<VideoDecoder>, boost::shared_ptr<AudioDecoder> > _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;
+ boost::shared_ptr<Trimmer> _trimmer;
};
};