Update libjingle to CL 53398036.
Review URL: https://webrtc-codereview.appspot.com/2323004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4872 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
@@ -46,7 +46,7 @@ struct Sender : public MessageHandler {
|
||||
Sender(Thread* th, AsyncSocket* s, uint32 rt)
|
||||
: thread(th), socket(new AsyncUDPSocket(s)),
|
||||
done(false), rate(rt), count(0) {
|
||||
last_send = Time();
|
||||
last_send = talk_base::Time();
|
||||
thread->PostDelayed(NextDelay(), this, 1);
|
||||
}
|
||||
|
||||
@@ -61,7 +61,7 @@ struct Sender : public MessageHandler {
|
||||
if (done)
|
||||
return;
|
||||
|
||||
uint32 cur_time = Time();
|
||||
uint32 cur_time = talk_base::Time();
|
||||
uint32 delay = cur_time - last_send;
|
||||
uint32 size = rate * delay / 1000;
|
||||
size = std::min<uint32>(size, 4096);
|
||||
@@ -105,7 +105,7 @@ struct Receiver : public MessageHandler, public sigslot::has_slots<> {
|
||||
sec_count += size;
|
||||
|
||||
uint32 send_time = *reinterpret_cast<const uint32*>(data);
|
||||
uint32 recv_time = Time();
|
||||
uint32 recv_time = talk_base::Time();
|
||||
uint32 delay = recv_time - send_time;
|
||||
sum += delay;
|
||||
sum_sq += delay * delay;
|
||||
|
Reference in New Issue
Block a user