| Index: webrtc/base/virtualsocketserver.cc
|
| diff --git a/webrtc/base/virtualsocketserver.cc b/webrtc/base/virtualsocketserver.cc
|
| index c6d402f1f3f27877b3e13a0afba8aa6c613da9ce..2d6ee0fa36326c0d41d4a5abab28c770028af6cc 100644
|
| --- a/webrtc/base/virtualsocketserver.cc
|
| +++ b/webrtc/base/virtualsocketserver.cc
|
| @@ -894,15 +894,15 @@ void VirtualSocketServer::AddPacketToNetwork(VirtualSocket* sender,
|
| // Post the packet as a message to be delivered (on our own thread)
|
| Packet* p = new Packet(data, data_size, sender_addr);
|
|
|
| - uint32_t ts = TimeAfter(send_delay + transit_delay);
|
| + int64_t ts = TimeAfter(send_delay + transit_delay);
|
| if (ordered) {
|
| // Ensure that new packets arrive after previous ones
|
| // TODO: consider ordering on a per-socket basis, since this
|
| - // introduces artifical delay.
|
| - ts = TimeMax(ts, network_delay_);
|
| + // introduces artificial delay.
|
| + ts = std::max(ts, network_delay_);
|
| }
|
| msg_queue_->PostAt(ts, recipient, MSG_ID_PACKET, p);
|
| - network_delay_ = TimeMax(ts, network_delay_);
|
| + network_delay_ = std::max(ts, network_delay_);
|
| }
|
|
|
| void VirtualSocketServer::PurgeNetworkPackets(VirtualSocket* socket,
|
|
|