admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete unused enum values for DataChannelType

Browse Source 
Bug: webrtc:9719
Change-Id: I2281636e3beaa2b0e59ac874b609e70e54d61cb7
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/179365
Reviewed-by: Taylor <deadbeef@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31752}
This commit is contained in:
Niels Möller 2020-07-15 14:39:16 +02:00 committed by Commit Bot
parent 13fbc08b93
commit 6b8271638b
4 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
media/base/media_engine.h
View File

@ -152,18 +152,6 @@ enum DataChannelType {
DCT_NONE = 0, DCT_NONE = 0,
DCT_RTP = 1, DCT_RTP = 1,
DCT_SCTP = 2, DCT_SCTP = 2,
// Data channel transport over media transport.
DCT_MEDIA_TRANSPORT = 3,
// Data channel transport over datagram transport (with no fallback). This is
// the same behavior as data channel transport over media transport, and is
// usable without DTLS.
DCT_DATA_CHANNEL_TRANSPORT = 4,
// Data channel transport over datagram transport (with SCTP negotiation
// semantics and a fallback to SCTP). Only usable with DTLS.
DCT_DATA_CHANNEL_TRANSPORT_SCTP = 5,
}; };
class DataEngineInterface { class DataEngineInterface {

4
pc/data_channel_utils.cc
View File

@ -48,9 +48,7 @@ void PacketQueue::Swap(PacketQueue* other) {
} }
bool IsSctpLike(cricket::DataChannelType type) { bool IsSctpLike(cricket::DataChannelType type) {
return type == cricket::DCT_SCTP || type == cricket::DCT_MEDIA_TRANSPORT || return type == cricket::DCT_SCTP;
type == cricket::DCT_DATA_CHANNEL_TRANSPORT ||
type == cricket::DCT_DATA_CHANNEL_TRANSPORT_SCTP;
} }
} // namespace webrtc } // namespace webrtc

4
pc/media_session.cc
View File

@ -2392,9 +2392,7 @@ bool MediaSessionDescriptionFactory::AddDataContentForOffer(
StreamParamsVec* current_streams, StreamParamsVec* current_streams,
SessionDescription* desc, SessionDescription* desc,
IceCredentialsIterator* ice_credentials) const { IceCredentialsIterator* ice_credentials) const {
bool is_sctp = bool is_sctp = (session_options.data_channel_type == DCT_SCTP);
(session_options.data_channel_type == DCT_SCTP ||
session_options.data_channel_type == DCT_DATA_CHANNEL_TRANSPORT_SCTP);
// If the DataChannel type is not specified, use the DataChannel type in // If the DataChannel type is not specified, use the DataChannel type in
// the current description. // the current description.
if (session_options.data_channel_type == DCT_NONE && current_content) { if (session_options.data_channel_type == DCT_NONE && current_content) {

4
pc/peer_connection.cc
View File

@ -5280,8 +5280,6 @@ absl::optional<std::string> PeerConnection::GetDataMid() const {
} }
return data_channel_controller_.rtp_data_channel()->content_name(); return data_channel_controller_.rtp_data_channel()->content_name();
case cricket::DCT_SCTP: case cricket::DCT_SCTP:
case cricket::DCT_DATA_CHANNEL_TRANSPORT:
case cricket::DCT_DATA_CHANNEL_TRANSPORT_SCTP:
return sctp_mid_s_; return sctp_mid_s_;
default: default:
return absl::nullopt; return absl::nullopt;
@ -6501,8 +6499,6 @@ cricket::VideoChannel* PeerConnection::CreateVideoChannel(
bool PeerConnection::CreateDataChannel(const std::string& mid) { bool PeerConnection::CreateDataChannel(const std::string& mid) {
switch (data_channel_type()) { switch (data_channel_type()) {
case cricket::DCT_SCTP: case cricket::DCT_SCTP:
case cricket::DCT_DATA_CHANNEL_TRANSPORT_SCTP:
case cricket::DCT_DATA_CHANNEL_TRANSPORT:
if (network_thread()->Invoke<bool>( if (network_thread()->Invoke<bool>(
RTC_FROM_HERE, RTC_FROM_HERE,
rtc::Bind(&PeerConnection::SetupDataChannelTransport_n, this, rtc::Bind(&PeerConnection::SetupDataChannelTransport_n, this,