projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Maybe re-sequence video when DCP frame rate changes.
[dcpomatic.git]
/
src
/
lib
/
transcoder.h
diff --git
a/src/lib/transcoder.h
b/src/lib/transcoder.h
index 4a9667b3c5165b95aa9f8aeea2786b206f184b56..b3c8f888b1106dfd4ffb6753ae247672ded2fff4 100644
(file)
--- a/
src/lib/transcoder.h
+++ b/
src/lib/transcoder.h
@@
-17,8
+17,9
@@
*/
*/
+#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.
@@
-27,17
+28,10
@@
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 Options;
+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.
@@
-45,22
+39,19
@@
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<const Film> f,
+ boost::shared_ptr<Job> j
+ );
void go ();
void go ();
- boost::shared_ptr<VideoDecoder> video_decoder () const {
- return _decoders.first;
- }
+ 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 */
- 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;
};
};