| Index: webrtc/base/messagequeue.cc
|
| diff --git a/webrtc/base/messagequeue.cc b/webrtc/base/messagequeue.cc
|
| index 61aa61192bbad69d87ddf5e79aab3a5af3ce290f..61c36e2ca045eaff3324318b0e76418edee77ba8 100644
|
| --- a/webrtc/base/messagequeue.cc
|
| +++ b/webrtc/base/messagequeue.cc
|
| @@ -27,7 +27,7 @@ typedef rtc::PhysicalSocketServer DefaultSocketServer;
|
|
|
| namespace rtc {
|
|
|
| -const uint32_t kMaxMsgLatency = 150; // 150 ms
|
| +const int kMaxMsgLatency = 150; // 150 ms
|
|
|
| //------------------------------------------------------------------
|
| // MessageQueueManager
|
| @@ -226,8 +226,8 @@ bool MessageQueue::Get(Message *pmsg, int cmsWait, bool process_io) {
|
|
|
| int cmsTotal = cmsWait;
|
| int cmsElapsed = 0;
|
| - uint32_t msStart = Time();
|
| - uint32_t msCurrent = msStart;
|
| + int64_t msStart = Time();
|
| + int64_t msCurrent = msStart;
|
| while (true) {
|
| // Check for sent messages
|
| ReceiveSends();
|
| @@ -246,7 +246,7 @@ bool MessageQueue::Get(Message *pmsg, int cmsWait, bool process_io) {
|
| if (first_pass) {
|
| first_pass = false;
|
| while (!dmsgq_.empty()) {
|
| - if (TimeIsLater(msCurrent, dmsgq_.top().msTrigger_)) {
|
| + if (msCurrent < dmsgq_.top().msTrigger_) {
|
| cmsDelayNext = TimeDiff(dmsgq_.top().msTrigger_, msCurrent);
|
| break;
|
| }
|
| @@ -349,7 +349,7 @@ void MessageQueue::PostDelayed(int cmsDelay,
|
| return DoDelayPost(cmsDelay, TimeAfter(cmsDelay), phandler, id, pdata);
|
| }
|
|
|
| -void MessageQueue::PostAt(uint32_t tstamp,
|
| +void MessageQueue::PostAt(int64_t tstamp,
|
| MessageHandler* phandler,
|
| uint32_t id,
|
| MessageData* pdata) {
|
| @@ -357,7 +357,7 @@ void MessageQueue::PostAt(uint32_t tstamp,
|
| }
|
|
|
| void MessageQueue::DoDelayPost(int cmsDelay,
|
| - uint32_t tstamp,
|
| + int64_t tstamp,
|
| MessageHandler* phandler,
|
| uint32_t id,
|
| MessageData* pdata) {
|
|
|