diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-01-16 00:21:23 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-04-19 23:04:32 +0100 |
| commit | 26807fe95fb7fbf0e5e6a8e32ab35068712ef058 (patch) | |
| tree | 62bab5bf8084727a8ecfb8b6e289867968baf853 /src/lib/encoder.cc | |
| parent | eb135e8dcdf36ae82420bcd18e954ad593b3e9a5 (diff) | |
Fix merge.
Diffstat (limited to 'src/lib/encoder.cc')
| -rw-r--r-- | src/lib/encoder.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc index f8a2ee3bd..a9e119d59 100644 --- a/src/lib/encoder.cc +++ b/src/lib/encoder.cc @@ -226,18 +226,18 @@ Encoder::encode (shared_ptr<PlayerVideo> pv, DCPTime time) if (_writer->can_fake_write (position)) { /* We can fake-write this frame */ - LOG_DEBUG_ENCODE("Frame @ %1 FAKE", to_string(pv->time())); + LOG_DEBUG_ENCODE("Frame @ %1 FAKE", to_string(time)); _writer->fake_write (position, pv->eyes ()); frame_done (); } else if (pv->has_j2k ()) { - LOG_DEBUG_ENCODE("Frame @ %1 J2K", to_string(pv->time())); + LOG_DEBUG_ENCODE("Frame @ %1 J2K", to_string(time)); /* This frame already has JPEG2000 data, so just write it */ _writer->write (pv->j2k(), position, pv->eyes ()); } else if (_last_player_video && _writer->can_repeat(position) && pv->same (_last_player_video)) { - LOG_DEBUG_ENCODE("Frame @ %1 REPEAT", to_string(pv->time())); + LOG_DEBUG_ENCODE("Frame @ %1 REPEAT", to_string(time)); _writer->repeat (position, pv->eyes ()); } else { - LOG_DEBUG_ENCODE("Frame @ %1 ENCODE", to_string(pv->time())); + LOG_DEBUG_ENCODE("Frame @ %1 ENCODE", to_string(time)); /* Queue this new frame for encoding */ LOG_TIMING ("add-frame-to-queue queue=%1", _queue.size ()); _queue.push_back (shared_ptr<DCPVideo> ( |