Delete unused enum values for DataChannelType
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}
diff --git a/media/base/media_engine.h b/media/base/media_engine.h
index be0ae59..4d9cc56 100644
--- a/media/base/media_engine.h
+++ b/media/base/media_engine.h
@@ -152,18 +152,6 @@
DCT_NONE = 0,
DCT_RTP = 1,
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 {
diff --git a/pc/data_channel_utils.cc b/pc/data_channel_utils.cc
index 21b1573..51d6af9 100644
--- a/pc/data_channel_utils.cc
+++ b/pc/data_channel_utils.cc
@@ -48,9 +48,7 @@
}
bool IsSctpLike(cricket::DataChannelType type) {
- return type == cricket::DCT_SCTP || type == cricket::DCT_MEDIA_TRANSPORT ||
- type == cricket::DCT_DATA_CHANNEL_TRANSPORT ||
- type == cricket::DCT_DATA_CHANNEL_TRANSPORT_SCTP;
+ return type == cricket::DCT_SCTP;
}
} // namespace webrtc
diff --git a/pc/media_session.cc b/pc/media_session.cc
index c03b1be..69ddb0c 100644
--- a/pc/media_session.cc
+++ b/pc/media_session.cc
@@ -2392,9 +2392,7 @@
StreamParamsVec* current_streams,
SessionDescription* desc,
IceCredentialsIterator* ice_credentials) const {
- bool is_sctp =
- (session_options.data_channel_type == DCT_SCTP ||
- session_options.data_channel_type == DCT_DATA_CHANNEL_TRANSPORT_SCTP);
+ bool is_sctp = (session_options.data_channel_type == DCT_SCTP);
// If the DataChannel type is not specified, use the DataChannel type in
// the current description.
if (session_options.data_channel_type == DCT_NONE && current_content) {
diff --git a/pc/peer_connection.cc b/pc/peer_connection.cc
index 877f100..1e738a9 100644
--- a/pc/peer_connection.cc
+++ b/pc/peer_connection.cc
@@ -5280,8 +5280,6 @@
}
return data_channel_controller_.rtp_data_channel()->content_name();
case cricket::DCT_SCTP:
- case cricket::DCT_DATA_CHANNEL_TRANSPORT:
- case cricket::DCT_DATA_CHANNEL_TRANSPORT_SCTP:
return sctp_mid_s_;
default:
return absl::nullopt;
@@ -6501,8 +6499,6 @@
bool PeerConnection::CreateDataChannel(const std::string& mid) {
switch (data_channel_type()) {
case cricket::DCT_SCTP:
- case cricket::DCT_DATA_CHANNEL_TRANSPORT_SCTP:
- case cricket::DCT_DATA_CHANNEL_TRANSPORT:
if (network_thread()->Invoke<bool>(
RTC_FROM_HERE,
rtc::Bind(&PeerConnection::SetupDataChannelTransport_n, this,
