From 99261af5a439cbd730c750ac7b97c3f99b994fad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Terelius?= Date: Wed, 12 May 2021 17:06:49 +0000 Subject: [PATCH] Revert "Define cricket::MediaType in terms of webrtc::MediaType" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 3ce6391b38397d107478041299fa998500e4fc42. Reason for revert: Breaks downstream test Original change's description: > Define cricket::MediaType in terms of webrtc::MediaType > > This is one step in getting rid of cricket::MediaType. > > Bug: webrtc:12754 > Fixes: webrtc:12764 > Change-Id: Idee832572bdc4c0e3bfdec6fb31ec0ba9db3e995 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/218346 > Commit-Queue: Harald Alvestrand > Reviewed-by: Mirko Bonadei > Cr-Commit-Position: refs/heads/master@{#33994} TBR=mbonadei@webrtc.org,hta@webrtc.org,webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com Change-Id: I64772018dea55e4f0946464364a60a39cec7e9ec No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:12754 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/218603 Reviewed-by: Björn Terelius Commit-Queue: Björn Terelius Cr-Commit-Position: refs/heads/master@{#34000} --- api/media_types.h | 23 +++++++++---------- media/engine/fake_webrtc_call.cc | 2 -- ...er_connection_header_extension_unittest.cc | 6 ++--- .../api/org/webrtc/MediaStreamTrack.java | 4 ++-- 4 files changed, 16 insertions(+), 19 deletions(-) diff --git a/api/media_types.h b/api/media_types.h index cd8b27b03e..b2ff08c0c3 100644 --- a/api/media_types.h +++ b/api/media_types.h @@ -15,23 +15,16 @@ #include "rtc_base/system/rtc_export.h" -namespace webrtc { - -enum class MediaType { ANY, AUDIO, VIDEO, DATA, UNSUPPORTED }; - -} // namespace webrtc - // The cricket and webrtc have separate definitions for what a media type is. -// They used to be incompatible, but now cricket is defined in terms of the -// webrtc definition. +// They're not compatible. Watch out for this. namespace cricket { enum MediaType { - MEDIA_TYPE_AUDIO = static_cast(webrtc::MediaType::AUDIO), - MEDIA_TYPE_VIDEO = static_cast(webrtc::MediaType::VIDEO), - MEDIA_TYPE_DATA = static_cast(webrtc::MediaType::DATA), - MEDIA_TYPE_UNSUPPORTED = static_cast(webrtc::MediaType::UNSUPPORTED), + MEDIA_TYPE_AUDIO, + MEDIA_TYPE_VIDEO, + MEDIA_TYPE_DATA, + MEDIA_TYPE_UNSUPPORTED }; extern const char kMediaTypeAudio[]; @@ -42,4 +35,10 @@ RTC_EXPORT std::string MediaTypeToString(MediaType type); } // namespace cricket +namespace webrtc { + +enum class MediaType { ANY, AUDIO, VIDEO, DATA }; + +} // namespace webrtc + #endif // API_MEDIA_TYPES_H_ diff --git a/media/engine/fake_webrtc_call.cc b/media/engine/fake_webrtc_call.cc index c3d3755177..76a70aaa57 100644 --- a/media/engine/fake_webrtc_call.cc +++ b/media/engine/fake_webrtc_call.cc @@ -452,7 +452,6 @@ webrtc::NetworkState FakeCall::GetNetworkState(webrtc::MediaType media) const { return video_network_state_; case webrtc::MediaType::DATA: case webrtc::MediaType::ANY: - case webrtc::MediaType::UNSUPPORTED: ADD_FAILURE() << "GetNetworkState called with unknown parameter."; return webrtc::kNetworkDown; } @@ -639,7 +638,6 @@ void FakeCall::SignalChannelNetworkState(webrtc::MediaType media, break; case webrtc::MediaType::DATA: case webrtc::MediaType::ANY: - case webrtc::MediaType::UNSUPPORTED: ADD_FAILURE() << "SignalChannelNetworkState called with unknown parameter."; } diff --git a/pc/peer_connection_header_extension_unittest.cc b/pc/peer_connection_header_extension_unittest.cc index 6ace2feaf6..8bf6c7ab44 100644 --- a/pc/peer_connection_header_extension_unittest.cc +++ b/pc/peer_connection_header_extension_unittest.cc @@ -199,9 +199,9 @@ TEST_P(PeerConnectionHeaderExtensionTest, NegotiatedExtensionsAreAccessible) { INSTANTIATE_TEST_SUITE_P( , PeerConnectionHeaderExtensionTest, - Combine(Values(cricket::MediaType::MEDIA_TYPE_AUDIO, - cricket::MediaType::MEDIA_TYPE_VIDEO), - Values(SdpSemantics::kPlanB, SdpSemantics::kUnifiedPlan)), + Combine(Values(SdpSemantics::kPlanB, SdpSemantics::kUnifiedPlan), + Values(cricket::MediaType::MEDIA_TYPE_AUDIO, + cricket::MediaType::MEDIA_TYPE_VIDEO)), [](const testing::TestParamInfo< PeerConnectionHeaderExtensionTest::ParamType>& info) { cricket::MediaType media_type; diff --git a/sdk/android/api/org/webrtc/MediaStreamTrack.java b/sdk/android/api/org/webrtc/MediaStreamTrack.java index fc93bd8c65..0249ffbfca 100644 --- a/sdk/android/api/org/webrtc/MediaStreamTrack.java +++ b/sdk/android/api/org/webrtc/MediaStreamTrack.java @@ -30,8 +30,8 @@ public class MediaStreamTrack { // Must be kept in sync with cricket::MediaType. public enum MediaType { - MEDIA_TYPE_AUDIO(1), - MEDIA_TYPE_VIDEO(2); + MEDIA_TYPE_AUDIO(0), + MEDIA_TYPE_VIDEO(1); private final int nativeIndex;