zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update libjingle to 52300956

Browse Source 
R=wu@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4744 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
sergeyu@chromium.org
2013-09-13 23:48:58 +00:00
parent 48af652ea5
commit a59696b2a5
21 changed files with 171 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
talk/app/webrtc/datachannel.cc
View File

@ -194,7 +194,8 @@ bool DataChannel::SendControl(const talk_base::Buffer* buffer) {
void DataChannel::SetReceiveSsrc(uint32 receive_ssrc) {
if (receive_ssrc_set_) {
ASSERT(session_->data_channel_type() == cricket::DCT_RTP ||
receive_ssrc_ == send_ssrc_);
!send_ssrc_set_ ||
receive_ssrc_ == send_ssrc_);
return;
}
receive_ssrc_ = receive_ssrc;
@ -210,7 +211,8 @@ void DataChannel::RemotePeerRequestClose() {
void DataChannel::SetSendSsrc(uint32 send_ssrc) {
if (send_ssrc_set_) {
ASSERT(session_->data_channel_type() == cricket::DCT_RTP ||
receive_ssrc_ == send_ssrc_);
!receive_ssrc_set_ ||
receive_ssrc_ == send_ssrc_);
return;
}
send_ssrc_ = send_ssrc;