projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename Content::_file to path and support md5sums of directories.
[dcpomatic.git]
/
src
/
lib
/
transcoder.cc
diff --git
a/src/lib/transcoder.cc
b/src/lib/transcoder.cc
index f4a52639a3cc5a887f3ae7c79991171e41527ac4..3002ef61c9c0f776d3b714bf326cb14ff7073d97 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<const Image> image,
Eyes eyes,
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,
same);
}
}
}
}
@@
-64,10
+64,10
@@
audio_proxy (weak_ptr<Encoder> encoder, shared_ptr<const AudioBuffers> audio)
*/
Transcoder::Transcoder (shared_ptr<const Film> f, shared_ptr<Job> j)
: _job (j)
*/
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))
{
- _player->Video.connect (bind (video_proxy, _encoder, _1, _2));
+ _player->Video.connect (bind (video_proxy, _encoder, _1, _2
, _3
));
_player->Audio.connect (bind (audio_proxy, _encoder, _1));
}
_player->Audio.connect (bind (audio_proxy, _encoder, _1));
}