diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-09-11 21:25:04 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-09-11 21:25:04 +0100 |
| commit | 4da15178a23cee90c9104df267a7dabdbee9cc8d (patch) | |
| tree | a138ea4a3178bdecbc9b3676e4d63cfb421b2c68 /src/lib/encoder.cc | |
| parent | 7979aeb87a83de31c4cf25f88eef4fbca4b56553 (diff) | |
No-op; rename a variable and add some comments.
Diffstat (limited to 'src/lib/encoder.cc')
| -rw-r--r-- | src/lib/encoder.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc index 8caa0190c..6848dc2b3 100644 --- a/src/lib/encoder.cc +++ b/src/lib/encoder.cc @@ -177,7 +177,7 @@ Encoder::frame_done () } void -Encoder::enqueue (shared_ptr<PlayerVideo> pvf) +Encoder::enqueue (shared_ptr<PlayerVideo> pv) { _waker.nudge (); @@ -204,16 +204,18 @@ Encoder::enqueue (shared_ptr<PlayerVideo> pvf) rethrow (); if (_writer->can_fake_write (_video_frames_out)) { - _writer->fake_write (_video_frames_out, pvf->eyes ()); + /* We can fake-write this frame */ + _writer->fake_write (_video_frames_out, pv->eyes ()); frame_done (); - } else if (pvf->has_j2k ()) { - _writer->write (pvf->j2k(), _video_frames_out, pvf->eyes ()); + } else if (pv->has_j2k ()) { + /* This frame already has JPEG2000 data, so just write it */ + _writer->write (pv->j2k(), _video_frames_out, pv->eyes ()); } else { /* Queue this new frame for encoding */ LOG_TIMING ("adding to queue of %1", _queue.size ()); _queue.push_back (shared_ptr<DCPVideo> ( new DCPVideo ( - pvf, + pv, _video_frames_out, _film->video_frame_rate(), _film->j2k_bandwidth(), @@ -229,7 +231,7 @@ Encoder::enqueue (shared_ptr<PlayerVideo> pvf) _empty_condition.notify_all (); } - if (pvf->eyes() != EYES_LEFT) { + if (pv->eyes() != EYES_LEFT) { ++_video_frames_out; } } |