diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-23 11:14:44 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-23 11:14:44 +0100 |
| commit | 4eb77be6999a3758998bfe37b28d4bb1cd55d51e (patch) | |
| tree | 9e2882f27751ee6badb1ee9b333bf1d012bd083b /src/lib/encoder.cc | |
| parent | fa4bac5dd1b8d0e09bd4a4eb20c83c0564858649 (diff) | |
Various 3D fixes.
Diffstat (limited to 'src/lib/encoder.cc')
| -rw-r--r-- | src/lib/encoder.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc index 8e61a0d60..7959fda6f 100644 --- a/src/lib/encoder.cc +++ b/src/lib/encoder.cc @@ -175,6 +175,8 @@ Encoder::process_video (shared_ptr<const Image> image, Eyes eyes, bool same) { boost::mutex::scoped_lock lock (_mutex); + /* XXX: discard 3D here if required */ + /* Wait until the queue has gone down a bit */ while (_queue.size() >= _threads.size() * 2 && !_terminate) { TIMING ("decoder sleeps with queue of %1", _queue.size()); @@ -212,7 +214,9 @@ Encoder::process_video (shared_ptr<const Image> image, Eyes eyes, bool same) _have_a_real_frame[eyes] = true; } - ++_video_frames_out; + if (eyes != EYES_LEFT) { + ++_video_frames_out; + } } void @@ -262,7 +266,7 @@ Encoder::encoder_thread (ServerDescription* server) TIMING ("encoder thread %1 wakes with queue of %2", boost::this_thread::get_id(), _queue.size()); shared_ptr<DCPVideoFrame> vf = _queue.front (); - _film->log()->log (String::compose (N_("Encoder thread %1 pops frame %2 from queue"), boost::this_thread::get_id(), vf->frame()), Log::VERBOSE); + _film->log()->log (String::compose (N_("Encoder thread %1 pops frame %2 (%3) from queue"), boost::this_thread::get_id(), vf->frame(), vf->eyes ())); _queue.pop_front (); lock.unlock (); |