summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_encoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-11-04 20:44:13 +0100
committerCarl Hetherington <cth@carlh.net>2019-11-16 22:46:39 +0100
commitfe64650ae5496c4de73894b97c53e6951ac3548f (patch)
tree222324080c3730fe3b03fbe071c37c338c3ac624 /src/lib/ffmpeg_encoder.cc
parented4fc06db6957b2b63b2400a737f47c18a1003be (diff)
Add some new Waker calls.
Backported from 052ec34bd487a3645013e87a7062738284d050df in v2.15.x
Diffstat (limited to 'src/lib/ffmpeg_encoder.cc')
-rw-r--r--src/lib/ffmpeg_encoder.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc
index 07b691956..3f5b6f591 100644
--- a/src/lib/ffmpeg_encoder.cc
+++ b/src/lib/ffmpeg_encoder.cc
@@ -119,6 +119,8 @@ FFmpegEncoder::go ()
job->sub (_("Encoding"));
}
+ Waker waker;
+
list<DCPTimePeriod> reel_periods = _film->reels ();
list<DCPTimePeriod>::const_iterator reel = reel_periods.begin ();
list<FileEncoderSet>::iterator encoder = _file_encoders.begin ();
@@ -155,6 +157,8 @@ FFmpegEncoder::go ()
job->set_progress (float(i.get()) / _film->length().get());
}
+ waker.nudge ();
+
_butler->get_audio (interleaved, audio_frames);
/* XXX: inefficient; butler interleaves and we deinterleave again */
float* p = interleaved;