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

Revert of Modify PeerConnection for end-to-end QuicDataChannel usage (patchset #4 id:60001 of https://codereview.webrtc.org/2089553002/ )

Browse Source 
Reason for revert:
Reverting because description was inaccurate. Will reland after updating description.

Original issue's description:
> Modify PeerConnection for end-to-end QuicDataChannel usage
>
> To allow end-to-end QuicDataChannel usage with a
> PeerConnection, RTCConfiguration has been modified to
> include a boolean for whether to do QUIC, since negotiation of
> QUIC is not implemented. If one peer does QUIC, then it will be
> assumed that the other peer must do QUIC or the connection
> will fail.
>
> PeerConnection has been modified to create data channels of type
> QuicDataChannel when the peer wants to do QUIC.
>
> WebRtcSession has been modified to use a QuicTransportChannel
> instead of a DtlsTransportChannelWrapper/DataChannel
> when QUIC should be used.
>
> Modification of previous in-flight CL: https://codereview.chromium.org/1844803002/
>
> Committed: https://crrev.com/36c8d69ce188102ae6fd48c371cf1518f08698fb
> Cr-Commit-Position: refs/heads/master@{#13470}

TBR=pthatcher@webrtc.org,zhihuang@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review-Url: https://codereview.webrtc.org/2146133002
Cr-Commit-Position: refs/heads/master@{#13471}
This commit is contained in:
deadbeef
2016-07-13 13:57:32 -07:00
committed by Commit bot
parent 36c8d69ce1
commit a2cd636b3d
11 changed files with 38 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
webrtc/api/quicdatachannel_unittest.cc
View File

@ -120,9 +120,8 @@ class FakeQuicDataTransport : public sigslot::has_slots<> {
DataChannelInit config;
config.id = id;
config.protocol = protocol;
rtc::scoped_refptr<QuicDataChannel> data_channel(
new QuicDataChannel(rtc::Thread::Current(), rtc::Thread::Current(),
rtc::Thread::Current(), label, config));
rtc::scoped_refptr<QuicDataChannel> data_channel(new QuicDataChannel(
rtc::Thread::Current(), rtc::Thread::Current(), label, config));
data_channel_by_id_[id] = data_channel;
return data_channel;
}
@ -202,6 +201,8 @@ class QuicDataChannelPeer {
// Connects |ice_transport_channel_| to that of the other peer.
void Connect(QuicDataChannelPeer* other_peer) {
ice_transport_channel_->Connect();
other_peer->ice_transport_channel_->Connect();
ice_transport_channel_->SetDestination(other_peer->ice_transport_channel_);
}