summaryrefslogtreecommitdiff
path: root/src/lib/encoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-01-17 23:56:49 +0000
committerCarl Hetherington <cth@carlh.net>2013-01-17 23:56:49 +0000
commita93bbd88eaa67a1e24471789335a2790b6cfbc78 (patch)
treedac3d867347af4c564145e543c25dbae214c9235 /src/lib/encoder.cc
parentcadd50fe2609a1ad9963389d65d8e91f85226752 (diff)
Some fixes and logs.
Diffstat (limited to 'src/lib/encoder.cc')
-rw-r--r--src/lib/encoder.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index c6960d0d1..0d5fc1c6e 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -601,7 +601,6 @@ Encoder::writer_thread ()
_write_queue.pop_front ();
lock.unlock ();
- /* XXX: write to mxf */
_film->log()->log (String::compose ("Writer writes %1 to MXF", encoded.second));
if (encoded.first) {
_picture_asset_writer->write (encoded.first->data(), encoded.first->size());
@@ -619,7 +618,7 @@ Encoder::writer_thread ()
Put some to disk.
*/
- pair<boost::shared_ptr<EncodedData>, int> encoded = _write_queue.front ();
+ pair<boost::shared_ptr<EncodedData>, int> encoded = _write_queue.back ();
_write_queue.pop_back ();
if (!encoded.first) {
/* This is a `repeat-last' frame, so no need to write it to disk */
@@ -627,7 +626,7 @@ Encoder::writer_thread ()
}
lock.unlock ();
- _film->log()->log (String::compose ("Writer full; pushes %1 to disk", encoded.second));
+ _film->log()->log (String::compose ("Writer full (awaiting %1); pushes %2 to disk", _last_written_frame + 1, encoded.second));
encoded.first->write (_film, encoded.second);
lock.lock ();