projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated da_DK translation from Anders Uhl Pedersen.
[dcpomatic.git]
/
src
/
lib
/
transcoder.cc
diff --git
a/src/lib/transcoder.cc
b/src/lib/transcoder.cc
index fd216c10112954d00c047945e35e7d1deaebe042..7eb3883ff452fce8ef7c1ffe8977d0f0abcf80a6 100644
(file)
--- a/
src/lib/transcoder.cc
+++ b/
src/lib/transcoder.cc
@@
-32,6
+32,8
@@
#include "player.h"
#include "job.h"
#include "writer.h"
#include "player.h"
#include "job.h"
#include "writer.h"
+#include "compose.hpp"
+#include "referenced_reel_asset.h"
#include "subtitle_content.h"
#include <boost/signals2.hpp>
#include <boost/foreach.hpp>
#include "subtitle_content.h"
#include <boost/signals2.hpp>
#include <boost/foreach.hpp>
@@
-50,7
+52,7
@@
using boost::dynamic_pointer_cast;
*/
Transcoder::Transcoder (shared_ptr<const Film> film, shared_ptr<Job> j)
: _film (film)
*/
Transcoder::Transcoder (shared_ptr<const Film> film, shared_ptr<Job> j)
: _film (film)
- , _player (new Player (film))
+ , _player (new Player (film
, film->playlist ()
))
, _writer (new Writer (film, j))
, _encoder (new Encoder (film, j, _writer))
, _finishing (false)
, _writer (new Writer (film, j))
, _encoder (new Encoder (film, j, _writer))
, _finishing (false)
@@
-61,6
+63,7
@@
Transcoder::Transcoder (shared_ptr<const Film> film, shared_ptr<Job> j)
void
Transcoder::go ()
{
void
Transcoder::go ()
{
+ _writer->start ();
_encoder->begin ();
DCPTime const frame = DCPTime::from_frames (1, _film->video_frame_rate ());
_encoder->begin ();
DCPTime const frame = DCPTime::from_frames (1, _film->video_frame_rate ());
@@
-84,21
+87,21
@@
Transcoder::go ()
}
for (DCPTime t; t < length; t += frame) {
}
for (DCPTime t; t < length; t += frame) {
- list<shared_ptr<PlayerVideo> > v = _player->get_video (t, true);
- for (list<shared_ptr<PlayerVideo> >::const_iterator i = v.begin(); i != v.end(); ++i) {
- _encoder->enqueue (*i);
- }
+ _encoder->encode (_player->get_video (t, true));
_writer->write (_player->get_audio (t, frame, true));
_writer->write (_player->get_audio (t, frame, true));
+
if (non_burnt_subtitles) {
if (non_burnt_subtitles) {
- _writer->write (_player->get_subtitles (t, frame, true, false));
+ _writer->write (_player->get_subtitles (t, frame, true, false
, true
));
}
}
}
}
+ BOOST_FOREACH (ReferencedReelAsset i, _player->get_reel_assets ()) {
+ _writer->write (i);
+ }
+
_finishing = true;
_encoder->end ();
_writer->finish ();
_finishing = true;
_encoder->end ();
_writer->finish ();
-
- _player->statistics().dump (_film->log ());
}
float
}
float
@@
-112,4
+115,3
@@
Transcoder::video_frames_out () const
{
return _encoder->video_frames_out ();
}
{
return _encoder->video_frames_out ();
}
-