projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reinstate subtitle speed-up patch 526fd6de4c80a7ac9614a1cb0209efff7b171cd5 but only...
[dcpomatic.git]
/
src
/
lib
/
transcoder.cc
diff --git
a/src/lib/transcoder.cc
b/src/lib/transcoder.cc
index ad8e4ab9be7c43f834eac17be7d4486827f82c7f..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>
@@
-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,16
+87,18
@@
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 ();