diff options
| author | wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-12-12 22:40:39 +0000 |
|---|---|---|
| committer | wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-12-12 22:40:39 +0000 |
| commit | 01d88c78467af6103d14524a369d3b9785983f05 (patch) | |
| tree | fccc44d64d2b383a368565d0fa6ae33a25700d02 /media/sctp | |
| parent | 59a84268b39cda024e0c7e59c5ca5d33b6b9d9db (diff) | |
| download | talk-01d88c78467af6103d14524a369d3b9785983f05.tar.gz | |
Update talk to 58113193 together with https://webrtc-codereview.appspot.com/5309005/.
R=mallinath@webrtc.org, niklas.enbom@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/5719004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@5274 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'media/sctp')
| -rw-r--r-- | media/sctp/sctpdataengine.cc | 3 | ||||
| -rw-r--r-- | media/sctp/sctpdataengine.h | 6 | ||||
| -rw-r--r-- | media/sctp/sctpdataengine_unittest.cc | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/media/sctp/sctpdataengine.cc b/media/sctp/sctpdataengine.cc index 2b86001..653273b 100644 --- a/media/sctp/sctpdataengine.cc +++ b/media/sctp/sctpdataengine.cc @@ -542,7 +542,8 @@ bool SctpDataMediaChannel::SendData( } // Called by network interface when a packet has been received. -void SctpDataMediaChannel::OnPacketReceived(talk_base::Buffer* packet) { +void SctpDataMediaChannel::OnPacketReceived( + talk_base::Buffer* packet, const talk_base::PacketTime& packet_time) { LOG(LS_VERBOSE) << debug_name_ << "->OnPacketReceived(...): " << " length=" << packet->length() << ", sending: " << sending_; // Only give receiving packets to usrsctp after if connected. This enables two diff --git a/media/sctp/sctpdataengine.h b/media/sctp/sctpdataengine.h index d09b152..4d05cf3 100644 --- a/media/sctp/sctpdataengine.h +++ b/media/sctp/sctpdataengine.h @@ -149,7 +149,8 @@ class SctpDataMediaChannel : public DataMediaChannel, const talk_base::Buffer& payload, SendDataResult* result = NULL); // A packet is received from the network interface. Posted to OnMessage. - virtual void OnPacketReceived(talk_base::Buffer* packet); + virtual void OnPacketReceived(talk_base::Buffer* packet, + const talk_base::PacketTime& packet_time); // Exposed to allow Post call from c-callbacks. talk_base::Thread* worker_thread() const { return worker_thread_; } @@ -170,7 +171,8 @@ class SctpDataMediaChannel : public DataMediaChannel, const std::vector<RtpHeaderExtension>& extensions) { return true; } virtual bool SetSendCodecs(const std::vector<DataCodec>& codecs); virtual bool SetRecvCodecs(const std::vector<DataCodec>& codecs); - virtual void OnRtcpReceived(talk_base::Buffer* packet) {} + virtual void OnRtcpReceived(talk_base::Buffer* packet, + const talk_base::PacketTime& packet_time) {} virtual void OnReadyToSend(bool ready) {} // Helper for debugging. diff --git a/media/sctp/sctpdataengine_unittest.cc b/media/sctp/sctpdataengine_unittest.cc index cab60b0..b4ad6ce 100644 --- a/media/sctp/sctpdataengine_unittest.cc +++ b/media/sctp/sctpdataengine_unittest.cc @@ -84,7 +84,7 @@ class SctpFakeNetworkInterface : public cricket::MediaChannel::NetworkInterface, static_cast<talk_base::TypedMessageData<talk_base::Buffer*>*>( msg->pdata)->data(); if (dest_) { - dest_->OnPacketReceived(buffer); + dest_->OnPacketReceived(buffer, talk_base::PacketTime()); } delete buffer; } |