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

Revert 5274 "Update talk to 58113193 together with https://webrt..."

Browse Source 
> 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

TBR=wu@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/5729004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5275 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
wu@webrtc.org
2013-12-12 22:54:25 +00:00
parent a129b6cd13
commit 2018269dc3
101 changed files with 290 additions and 490 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
talk/media/sctp/sctpdataengine.h
View File

@@ -149,8 +149,7 @@ 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,
const talk_base::PacketTime& packet_time);
virtual void OnPacketReceived(talk_base::Buffer* packet);
// Exposed to allow Post call from c-callbacks.
talk_base::Thread* worker_thread() const { return worker_thread_; }
@@ -171,8 +170,7 @@ 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,
const talk_base::PacketTime& packet_time) {}
virtual void OnRtcpReceived(talk_base::Buffer* packet) {}
virtual void OnReadyToSend(bool ready) {}
// Helper for debugging.