projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix possible null pointer dereference.
[dcpomatic.git]
/
src
/
lib
/
transcoder.cc
diff --git
a/src/lib/transcoder.cc
b/src/lib/transcoder.cc
index 27e35ac528b37f0609f915be2d6ffb15ae309a5c..49742f98d551b12b6168f0d54d0b8f1c937a679b 100644
(file)
--- a/
src/lib/transcoder.cc
+++ b/
src/lib/transcoder.cc
@@
-62,6
+62,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 ());
@@
-89,12
+90,22
@@
Transcoder::go ()
for (list<shared_ptr<PlayerVideo> >::const_iterator i = v.begin(); i != v.end(); ++i) {
_encoder->enqueue (*i);
}
for (list<shared_ptr<PlayerVideo> >::const_iterator i = v.begin(); i != v.end(); ++i) {
_encoder->enqueue (*i);
}
- _writer->write (_player->get_audio (t, frame, true));
+
+ shared_ptr<AudioBuffers> audio = _player->get_audio (t, frame, true);
+ if (audio) {
+ _writer->write (audio);
+ }
+
if (non_burnt_subtitles) {
_writer->write (_player->get_subtitles (t, frame, true, false));
}
}
if (non_burnt_subtitles) {
_writer->write (_player->get_subtitles (t, frame, true, false));
}
}
+ /* XXX: we should be passing through details of positions, at least... */
+ BOOST_FOREACH (shared_ptr<dcp::ReelAsset> i, _player->get_reel_assets ()) {
+ _writer->write (i);
+ }
+
_finishing = true;
_encoder->end ();
_writer->finish ();
_finishing = true;
_encoder->end ();
_writer->finish ();