diff options
| author | wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-12-12 22:54:25 +0000 |
|---|---|---|
| committer | wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-12-12 22:54:25 +0000 |
| commit | a064d5de938aebae46dfb11446ca4e66fac1762f (patch) | |
| tree | f5a85cc17a4104a8059cac0ad08eb72176e8c712 /media/base/mediachannel.h | |
| parent | 01d88c78467af6103d14524a369d3b9785983f05 (diff) | |
| download | talk-a064d5de938aebae46dfb11446ca4e66fac1762f.tar.gz | |
Revert 5274 "Update talk to 58113193 together with https://webrt..."
> 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/talk@5275 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'media/base/mediachannel.h')
| -rw-r--r-- | media/base/mediachannel.h | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/media/base/mediachannel.h b/media/base/mediachannel.h index 94ae03f..9e1ea9d 100644 --- a/media/base/mediachannel.h +++ b/media/base/mediachannel.h @@ -509,11 +509,9 @@ class MediaChannel : public sigslot::has_slots<> { } // Called when a RTP packet is received. - virtual void OnPacketReceived(talk_base::Buffer* packet, - const talk_base::PacketTime& packet_time) = 0; + virtual void OnPacketReceived(talk_base::Buffer* packet) = 0; // Called when a RTCP packet is received. - virtual void OnRtcpReceived(talk_base::Buffer* packet, - const talk_base::PacketTime& packet_time) = 0; + virtual void OnRtcpReceived(talk_base::Buffer* packet) = 0; // Called when the socket's ability to send has changed. virtual void OnReadyToSend(bool ready) = 0; // Creates a new outgoing media stream with SSRCs and CNAME as described @@ -1133,15 +1131,25 @@ class DataMediaChannel : public MediaChannel { virtual ~DataMediaChannel() {} + virtual bool SetSendBandwidth(bool autobw, int bps) = 0; virtual bool SetSendCodecs(const std::vector<DataCodec>& codecs) = 0; virtual bool SetRecvCodecs(const std::vector<DataCodec>& codecs) = 0; - + virtual bool SetRecvRtpHeaderExtensions( + const std::vector<RtpHeaderExtension>& extensions) = 0; + virtual bool SetSendRtpHeaderExtensions( + const std::vector<RtpHeaderExtension>& extensions) = 0; + virtual bool AddSendStream(const StreamParams& sp) = 0; + virtual bool RemoveSendStream(uint32 ssrc) = 0; + virtual bool AddRecvStream(const StreamParams& sp) = 0; + virtual bool RemoveRecvStream(uint32 ssrc) = 0; virtual bool MuteStream(uint32 ssrc, bool on) { return false; } // TODO(pthatcher): Implement this. virtual bool GetStats(DataMediaInfo* info) { return true; } virtual bool SetSend(bool send) = 0; virtual bool SetReceive(bool receive) = 0; + virtual void OnPacketReceived(talk_base::Buffer* packet) = 0; + virtual void OnRtcpReceived(talk_base::Buffer* packet) = 0; virtual bool SendData( const SendDataParams& params, |