From a93bbd88eaa67a1e24471789335a2790b6cfbc78 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 17 Jan 2013 23:56:49 +0000 Subject: [PATCH] Some fixes and logs. --- src/lib/encoder.cc | 5 ++--- src/lib/log.cc | 2 +- 2 files changed, 3 insertions(+), 4 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, int> encoded = _write_queue.front (); + pair, 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 (); diff --git a/src/lib/log.cc b/src/lib/log.cc index 06cff0495..7459700ea 100644 --- a/src/lib/log.cc +++ b/src/lib/log.cc @@ -28,7 +28,7 @@ using namespace std; Log::Log () - : _level (VERBOSE) + : _level (STANDARD) { } -- 2.30.2