Index: webrtc/modules/video_coding/timing.cc |
diff --git a/webrtc/modules/video_coding/timing.cc b/webrtc/modules/video_coding/timing.cc |
index 680860a191d5bf7b1dafcad53d275c63bbb4dfe2..8748fb962f91df712bcdcfb5249908cefeae3dc3 100644 |
--- a/webrtc/modules/video_coding/timing.cc |
+++ b/webrtc/modules/video_coding/timing.cc |
@@ -173,7 +173,7 @@ int32_t VCMTiming::StopDecodeTimer(uint32_t time_stamp, |
int64_t now_ms, |
int64_t render_time_ms) { |
CriticalSectionScoped cs(crit_sect_); |
- codec_timer_.MaxFilter(decode_time_ms, now_ms); |
+ codec_timer_.AddTiming(decode_time_ms, now_ms); |
assert(decode_time_ms >= 0); |
last_decode_ms_ = decode_time_ms; |
@@ -218,7 +218,7 @@ int64_t VCMTiming::RenderTimeMsInternal(uint32_t frame_timestamp, |
// Must be called from inside a critical section. |
int32_t VCMTiming::MaxDecodeTimeMs( |
magjed_webrtc
2016/03/04 14:19:41
Do you want me to change this function name as wel
philipel
2016/03/04 15:20:13
Yes, RequiredDecodeTimeMs should work here as well
|
FrameType frame_type /*= kVideoFrameDelta*/) const { |
- const int32_t decode_time_ms = codec_timer_.RequiredDecodeTimeMs(frame_type); |
+ const int32_t decode_time_ms = codec_timer_.RequiredDecodeTimeMs(); |
assert(decode_time_ms >= 0); |
return decode_time_ms; |
} |