Some missing frame_done()s.
authorCarl Hetherington <cth@carlh.net>
Fri, 18 Jan 2013 00:19:21 +0000 (00:19 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 18 Jan 2013 00:19:21 +0000 (00:19 +0000)
src/lib/encoder.cc

index 0d5fc1c6efbca6dd8a843a284b7dfde905d3959e..b37a3c098d9a245381b05ac13a61ec7439509c75 100644 (file)
@@ -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 (