projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add subtitle X offset option.
[dcpomatic.git]
/
src
/
lib
/
transcoder.cc
diff --git
a/src/lib/transcoder.cc
b/src/lib/transcoder.cc
index f4a52639a3cc5a887f3ae7c79991171e41527ac4..1c8f7e3eb0b021d03f6c62a0076ce4cd41f56188 100644
(file)
--- a/
src/lib/transcoder.cc
+++ b/
src/lib/transcoder.cc
@@
-40,11
+40,11
@@
using boost::weak_ptr;
using boost::dynamic_pointer_cast;
static void
using boost::dynamic_pointer_cast;
static void
-video_proxy (weak_ptr<Encoder> encoder, shared_ptr<
const Image> image
, bool same)
+video_proxy (weak_ptr<Encoder> encoder, shared_ptr<
PlayerImage> image, Eyes eyes, ColourConversion conversion
, bool same)
{
shared_ptr<Encoder> e = encoder.lock ();
if (e) {
{
shared_ptr<Encoder> e = encoder.lock ();
if (e) {
- e->process_video (image, same);
+ e->process_video (image,
eyes, conversion,
same);
}
}
}
}
@@
-59,15
+59,14
@@
audio_proxy (weak_ptr<Encoder> encoder, shared_ptr<const AudioBuffers> audio)
/** Construct a transcoder using a Decoder that we create and a supplied Encoder.
* @param f Film that we are transcoding.
/** Construct a transcoder using a Decoder that we create and a supplied Encoder.
* @param f Film that we are transcoding.
- * @param j Job that we are running under, or 0.
* @param e Encoder to use.
*/
Transcoder::Transcoder (shared_ptr<const Film> f, shared_ptr<Job> j)
* @param e Encoder to use.
*/
Transcoder::Transcoder (shared_ptr<const Film> f, shared_ptr<Job> j)
- : _job (j)
- , _player (f->player ())
+ : _player (f->make_player ())
, _encoder (new Encoder (f, j))
, _encoder (new Encoder (f, j))
+ , _finishing (false)
{
{
- _player->Video.connect (bind (video_proxy, _encoder, _1, _2));
+ _player->Video.connect (bind (video_proxy, _encoder, _1, _2
, _3, _4
));
_player->Audio.connect (bind (audio_proxy, _encoder, _1));
}
_player->Audio.connect (bind (audio_proxy, _encoder, _1));
}
@@
-76,6
+75,8
@@
Transcoder::go ()
{
_encoder->process_begin ();
while (!_player->pass ()) {}
{
_encoder->process_begin ();
while (!_player->pass ()) {}
+
+ _finishing = true;
_encoder->process_end ();
}
_encoder->process_end ();
}
@@
-90,3
+91,4
@@
Transcoder::video_frames_out () const
{
return _encoder->video_frames_out ();
}
{
return _encoder->video_frames_out ();
}
+