| commit | 99b4162ccf5bf1ab2f695849d4309f4db302c46a | [log] [tgz] |
|---|---|---|
| author | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | Wed May 21 20:42:17 2014 +0000 |
| committer | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | Wed May 21 20:42:17 2014 +0000 |
| tree | e07d6ed6d8e5dedf961dfd2e18805afe0a8b6347 | |
| parent | f9f1bfbdaecc68594bc9ca8e52f2733e2742d3f8 [diff] [blame] |
Rebase webrtc/base 6163:6216 (svn diff -r 6163:6216 http://webrtc.googlecode.com/svn/trunk/talk/base, apply diff manually) BUG=3379 TBR=wu@webrtc.org Review URL: https://webrtc-codereview.appspot.com/17619004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6217 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/base/timeutils.cc b/webrtc/base/timeutils.cc index aefa285..dcf83e3 100644 --- a/webrtc/base/timeutils.cc +++ b/webrtc/base/timeutils.cc
@@ -186,4 +186,18 @@ #endif } +TimestampWrapAroundHandler::TimestampWrapAroundHandler() + : last_ts_(0), num_wrap_(0) {} + +int64 TimestampWrapAroundHandler::Unwrap(uint32 ts) { + if (ts < last_ts_) { + if (last_ts_ > 0xf0000000 && ts < 0x0fffffff) { + ++num_wrap_; + } + } + last_ts_ = ts; + int64_t unwrapped_ts = ts + (num_wrap_ << 32); + return unwrapped_ts; +} + } // namespace rtc