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

4
talk/session/tunnel/pseudotcpchannel.cc
View File

@@ -340,7 +340,9 @@ void PseudoTcpChannel::OnChannelWritableState(TransportChannel* channel) {
}
void PseudoTcpChannel::OnChannelRead(TransportChannel* channel,
const char* data, size_t size, int flags) {
const char* data, size_t size,
const talk_base::PacketTime& packet_time,
int flags) {
//LOG_F(LS_VERBOSE) << "(" << size << ")";
ASSERT(worker_thread_->IsCurrent());
CritScope lock(&cs_);

2
talk/session/tunnel/pseudotcpchannel.h
View File

@@ -111,7 +111,7 @@ class PseudoTcpChannel
// Worker thread methods
void OnChannelWritableState(TransportChannel* channel);
void OnChannelRead(TransportChannel* channel, const char* data, size_t size,
int flags);
const talk_base::PacketTime& packet_time, int flags);
void OnChannelConnectionChanged(TransportChannel* channel,
const Candidate& candidate);