| Index: webrtc/modules/video_coding/receiver.cc
|
| diff --git a/webrtc/modules/video_coding/receiver.cc b/webrtc/modules/video_coding/receiver.cc
|
| index 5314b307672eb50a9d1c3db85a916b766b53452f..efbb34402a6068961ec068f8f993c46b55e1f00d 100644
|
| --- a/webrtc/modules/video_coding/receiver.cc
|
| +++ b/webrtc/modules/video_coding/receiver.cc
|
| @@ -94,9 +94,10 @@ void VCMReceiver::TriggerDecoderShutdown() {
|
| render_wait_event_->Set();
|
| }
|
|
|
| -VCMEncodedFrame* VCMReceiver::FrameForDecoding(uint16_t max_wait_time_ms,
|
| - int64_t& next_render_time_ms,
|
| - bool render_timing) {
|
| +VCMEncodedFrame* VCMReceiver::FrameForDecoding(
|
| + uint16_t max_wait_time_ms,
|
| + int64_t& next_render_time_ms,
|
| + bool prefer_decode_late) {
|
| const int64_t start_time_ms = clock_->TimeInMilliseconds();
|
| uint32_t frame_timestamp = 0;
|
| // Exhaust wait time to get a complete frame for decoding.
|
| @@ -140,7 +141,7 @@ VCMEncodedFrame* VCMReceiver::FrameForDecoding(uint16_t max_wait_time_ms,
|
| return NULL;
|
| }
|
|
|
| - if (!render_timing) {
|
| + if (prefer_decode_late) {
|
| // Decode frame as close as possible to the render timestamp.
|
| const int32_t available_wait_time = max_wait_time_ms -
|
| static_cast<int32_t>(clock_->TimeInMilliseconds() - start_time_ms);
|
|
|