| Index: webrtc/base/virtualsocketserver.cc
|
| diff --git a/webrtc/base/virtualsocketserver.cc b/webrtc/base/virtualsocketserver.cc
|
| index f5b7db7f07f514c5c6a82e84eef7c5d12c4f1d31..216a6974ab600c833e58e8e8af02caa18541dd11 100644
|
| --- a/webrtc/base/virtualsocketserver.cc
|
| +++ b/webrtc/base/virtualsocketserver.cc
|
| @@ -264,12 +264,16 @@ int VirtualSocket::SendTo(const void* pv,
|
| }
|
| }
|
|
|
| -int VirtualSocket::Recv(void* pv, size_t cb) {
|
| +int VirtualSocket::Recv(void* pv, size_t cb, int64_t* timestamp) {
|
| SocketAddress addr;
|
| - return RecvFrom(pv, cb, &addr);
|
| + return RecvFrom(pv, cb, &addr, timestamp);
|
| }
|
|
|
| -int VirtualSocket::RecvFrom(void* pv, size_t cb, SocketAddress* paddr) {
|
| +int VirtualSocket::RecvFrom(void* pv,
|
| + size_t cb,
|
| + SocketAddress* paddr,
|
| + int64_t* timestamp) {
|
| + *timestamp = -1;
|
| // If we don't have a packet, then either error or wait for one to arrive.
|
| if (recv_buffer_.empty()) {
|
| if (async_) {
|
|
|