| Index: webrtc/modules/video_coding/main/source/timing.cc
|
| diff --git a/webrtc/modules/video_coding/main/source/timing.cc b/webrtc/modules/video_coding/main/source/timing.cc
|
| index 8d59135876017c38845367474c758426bd14f242..d8ab96d84466ddc1a674a139f62ad806782b5726 100644
|
| --- a/webrtc/modules/video_coding/main/source/timing.cc
|
| +++ b/webrtc/modules/video_coding/main/source/timing.cc
|
| @@ -165,13 +165,13 @@ void VCMTiming::UpdateCurrentDelay(int64_t render_time_ms,
|
| }
|
|
|
| int32_t VCMTiming::StopDecodeTimer(uint32_t time_stamp,
|
| - int64_t start_time_ms,
|
| + int32_t decode_time_ms,
|
| int64_t now_ms,
|
| int64_t render_time_ms) {
|
| CriticalSectionScoped cs(crit_sect_);
|
| - int32_t time_diff_ms = codec_timer_.StopTimer(start_time_ms, now_ms);
|
| - assert(time_diff_ms >= 0);
|
| - last_decode_ms_ = time_diff_ms;
|
| + codec_timer_.MaxFilter(decode_time_ms, now_ms);
|
| + assert(decode_time_ms >= 0);
|
| + last_decode_ms_ = decode_time_ms;
|
|
|
| // Update stats.
|
| ++num_decoded_frames_;
|
|
|