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

pRevert 5371 "Revert 5367 "Update talk to 59410372.""

Browse Source 
> Revert 5367 "Update talk to 59410372."
> 
> > Update talk to 59410372.
> > 
> > R=jiayl@webrtc.org, wu@webrtc.org
> > 
> > Review URL: https://webrtc-codereview.appspot.com/6929004
> 
> TBR=mallinath@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/6999004

TBR=henrika@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5381 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrika@webrtc.org
2014-01-14 10:00:58 +00:00
parent 4371d4650a
commit aebb1ade9d
50 changed files with 974 additions and 746 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
talk/session/media/channel.cc
View File

@@ -81,7 +81,6 @@ enum {
MSG_SETSCREENCASTFACTORY,
MSG_FIRSTPACKETRECEIVED,
MSG_SESSION_ERROR,
MSG_NEWSTREAMRECEIVED,
};
// Value specified in RFC 5764.
@@ -2515,8 +2514,6 @@ bool DataChannel::Init() {
this, &DataChannel::OnDataChannelError);
media_channel()->SignalReadyToSend.connect(
this, &DataChannel::OnDataChannelReadyToSend);
media_channel()->SignalNewStreamReceived.connect(
this, &DataChannel::OnDataChannelNewStreamReceived);
srtp_filter()->SignalSrtpError.connect(
this, &DataChannel::OnSrtpError);
return true;
@@ -2740,13 +2737,6 @@ void DataChannel::OnMessage(talk_base::Message *pmsg) {
delete data;
break;
}
case MSG_NEWSTREAMRECEIVED: {
DataChannelNewStreamReceivedMessageData* data =
static_cast<DataChannelNewStreamReceivedMessageData*>(pmsg->pdata);
SignalNewStreamReceived(data->label, data->init);
delete data;
break;
}
default:
BaseChannel::OnMessage(pmsg);
break;
@@ -2802,14 +2792,6 @@ void DataChannel::OnDataChannelReadyToSend(bool writable) {
new DataChannelReadyToSendMessageData(writable));
}
void DataChannel::OnDataChannelNewStreamReceived(
const std::string& label, const webrtc::DataChannelInit& init) {
signaling_thread()->Post(
this,
MSG_NEWSTREAMRECEIVED,
new DataChannelNewStreamReceivedMessageData(label, init));
}
void DataChannel::OnSrtpError(uint32 ssrc, SrtpFilter::Mode mode,
SrtpFilter::Error error) {
switch (error) {

19
talk/session/media/channel.h
View File

@@ -31,7 +31,6 @@
#include <string>
#include <vector>
#include "talk/app/webrtc/datachannelinterface.h"
#include "talk/base/asyncudpsocket.h"
#include "talk/base/criticalsection.h"
#include "talk/base/network.h"
@@ -634,11 +633,6 @@ class DataChannel : public BaseChannel {
// That occurs when the channel is enabled, the transport is writable,
// both local and remote descriptions are set, and the channel is unblocked.
sigslot::signal1<bool> SignalReadyToSendData;
// Signal for notifying when a new stream is added from the remote side. Used
// for the in-band negotioation through the OPEN message for SCTP data
// channel.
sigslot::signal2<const std::string&, const webrtc::DataChannelInit&>
SignalNewStreamReceived;
protected:
// downcasts a MediaChannel.
@@ -678,17 +672,6 @@ class DataChannel : public BaseChannel {
typedef talk_base::TypedMessageData<bool> DataChannelReadyToSendMessageData;
struct DataChannelNewStreamReceivedMessageData
: public talk_base::MessageData {
DataChannelNewStreamReceivedMessageData(
const std::string& label, const webrtc::DataChannelInit& init)
: label(label),
init(init) {
}
const std::string label;
const webrtc::DataChannelInit init;
};
// overrides from BaseChannel
virtual const ContentInfo* GetFirstContent(const SessionDescription* sdesc);
// If data_channel_type_ is DCT_NONE, set it. Otherwise, check that
@@ -717,8 +700,6 @@ class DataChannel : public BaseChannel {
const ReceiveDataParams& params, const char* data, size_t len);
void OnDataChannelError(uint32 ssrc, DataMediaChannel::Error error);
void OnDataChannelReadyToSend(bool writable);
void OnDataChannelNewStreamReceived(const std::string& label,
const webrtc::DataChannelInit& init);
void OnSrtpError(uint32 ssrc, SrtpFilter::Mode mode, SrtpFilter::Error error);
talk_base::scoped_ptr<DataMediaMonitor> media_monitor_;