generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update talk to 58113193 together with https://webrtc-codereview.appspot.com/5309005/.

Browse Source 
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@5274 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
wu@webrtc.org
2013-12-12 22:40:39 +00:00
parent 451745ec05
commit a129b6cd13
101 changed files with 490 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
talk/media/sctp/sctpdataengine.cc
View File

@@ -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