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

Fire OnRenegotiationNeeded only for the first SCTP DataChannel.

Browse Source 
Subsequent DataChannels do not need renegotiation since SCTP data streams are not negotiated through SDP.

BUG=2431
R=pthatcher@google.com, wu@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6268 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
jiayl@webrtc.org
2014-05-29 15:31:11 +00:00
parent 9aa7d8df95
commit 001fd2d503
2 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
talk/app/webrtc/peerconnection.cc
View File

@@ -482,6 +482,8 @@ talk_base::scoped_refptr<DataChannelInterface>
PeerConnection::CreateDataChannel( PeerConnection::CreateDataChannel(
const std::string& label, const std::string& label,
const DataChannelInit* config) { const DataChannelInit* config) {
bool first_datachannel = !mediastream_signaling_->HasDataChannels();
talk_base::scoped_ptr<InternalDataChannelInit> internal_config; talk_base::scoped_ptr<InternalDataChannelInit> internal_config;
if (config) { if (config) {
internal_config.reset(new InternalDataChannelInit(*config)); internal_config.reset(new InternalDataChannelInit(*config));
@@ -491,7 +493,11 @@ PeerConnection::CreateDataChannel(
if (!channel.get()) if (!channel.get())
return NULL; return NULL;
observer_->OnRenegotiationNeeded(); // Trigger the onRenegotiationNeeded event for every new RTP DataChannel, or
// the first SCTP DataChannel.
if (session_->data_channel_type() == cricket::DCT_RTP || first_datachannel) {
observer_->OnRenegotiationNeeded();
}
return DataChannelProxy::Create(signaling_thread(), channel.get()); return DataChannelProxy::Create(signaling_thread(), channel.get());
} }

22
talk/app/webrtc/peerconnectioninterface_unittest.cc
View File

@@ -946,23 +946,28 @@ TEST_F(PeerConnectionInterfaceTest, CreateSctpDataChannel) {
pc_->CreateDataChannel("1", &config); pc_->CreateDataChannel("1", &config);
EXPECT_TRUE(channel != NULL); EXPECT_TRUE(channel != NULL);
EXPECT_TRUE(channel->reliable()); EXPECT_TRUE(channel->reliable());
EXPECT_TRUE(observer_.renegotiation_needed_);
observer_.renegotiation_needed_ = false;
config.ordered = false; config.ordered = false;
channel = pc_->CreateDataChannel("2", &config); channel = pc_->CreateDataChannel("2", &config);
EXPECT_TRUE(channel != NULL); EXPECT_TRUE(channel != NULL);
EXPECT_TRUE(channel->reliable()); EXPECT_TRUE(channel->reliable());
EXPECT_FALSE(observer_.renegotiation_needed_);
config.ordered = true; config.ordered = true;
config.maxRetransmits = 0; config.maxRetransmits = 0;
channel = pc_->CreateDataChannel("3", &config); channel = pc_->CreateDataChannel("3", &config);
EXPECT_TRUE(channel != NULL); EXPECT_TRUE(channel != NULL);
EXPECT_FALSE(channel->reliable()); EXPECT_FALSE(channel->reliable());
EXPECT_FALSE(observer_.renegotiation_needed_);
config.maxRetransmits = -1; config.maxRetransmits = -1;
config.maxRetransmitTime = 0; config.maxRetransmitTime = 0;
channel = pc_->CreateDataChannel("4", &config); channel = pc_->CreateDataChannel("4", &config);
EXPECT_TRUE(channel != NULL); EXPECT_TRUE(channel != NULL);
EXPECT_FALSE(channel->reliable()); EXPECT_FALSE(channel->reliable());
EXPECT_FALSE(observer_.renegotiation_needed_);
} }
// This tests that no data channel is returned if both maxRetransmits and // This tests that no data channel is returned if both maxRetransmits and
@@ -1012,6 +1017,23 @@ TEST_F(PeerConnectionInterfaceTest,
EXPECT_TRUE(channel == NULL); EXPECT_TRUE(channel == NULL);
} }
// This test verifies that OnRenegotiationNeeded is fired for every new RTP
// DataChannel.
TEST_F(PeerConnectionInterfaceTest, RenegotiationNeededForNewRtpDataChannel) {
FakeConstraints constraints;
constraints.SetAllowRtpDataChannels();
CreatePeerConnection(&constraints);
scoped_refptr<DataChannelInterface> dc1 =
pc_->CreateDataChannel("test1", NULL);
EXPECT_TRUE(observer_.renegotiation_needed_);
observer_.renegotiation_needed_ = false;
scoped_refptr<DataChannelInterface> dc2 =
pc_->CreateDataChannel("test2", NULL);
EXPECT_TRUE(observer_.renegotiation_needed_);
}
// This test that a data channel closes when a PeerConnection is deleted/closed. // This test that a data channel closes when a PeerConnection is deleted/closed.
TEST_F(PeerConnectionInterfaceTest, DataChannelCloseWhenPeerConnectionClose) { TEST_F(PeerConnectionInterfaceTest, DataChannelCloseWhenPeerConnectionClose) {
FakeConstraints constraints; FakeConstraints constraints;