diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-01-18 00:19:21 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-01-18 00:19:21 +0000 |
| commit | d4024b9f794823a2808724ae9fae74195f1a0824 (patch) | |
| tree | 6488a58908bf050525cd5097df24bc0cf2bee5f4 /src/lib/encoder.cc | |
| parent | a93bbd88eaa67a1e24471789335a2790b6cfbc78 (diff) | |
Some missing frame_done()s.
Diffstat (limited to 'src/lib/encoder.cc')
| -rw-r--r-- | src/lib/encoder.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc index 0d5fc1c6e..b37a3c098 100644 --- a/src/lib/encoder.cc +++ b/src/lib/encoder.cc @@ -334,6 +334,7 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su */ boost::mutex::scoped_lock lock2 (_writer_mutex); _write_queue.push_back (make_pair (shared_ptr<EncodedData> (), _video_frames_out)); + frame_done (); } else { /* Queue this new frame for encoding */ pair<string, string> const s = Filter::ffmpeg_strings (_film->filters()); @@ -359,6 +360,7 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su boost::mutex::scoped_lock lock2 (_writer_mutex); _write_queue.push_back (make_pair (shared_ptr<EncodedData> (), _video_frames_out)); ++_video_frames_out; + frame_done (); } } @@ -529,6 +531,7 @@ Encoder::encoder_thread (ServerDescription* server) boost::mutex::scoped_lock lock2 (_writer_mutex); _write_queue.push_back (make_pair (encoded, vf->frame ())); _writer_condition.notify_all (); + frame_done (); } else { lock.lock (); _film->log()->log ( |