commit 6f90fa3bba33bff12821fda4580fbd73da944ffc
author Harald Alvestrand <hta@webrtc.org> Tue Feb 25 07:07:23 2025
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Feb 25 11:08:58 2025
tree 02ace8a06cefb59a5161880d3b35b6d0873d1653
parent 45c998d1aa034bc5c5fe5cf143f16cef623b117e

Define cricket::MediaType in terms of webrtc::MediaType

This is one step in getting rid of cricket::MediaType.

Bug: webrtc:12754
Change-Id: I4faffab2a3ddbd8b7f2346846380315ecab5f018
Fixes: webrtc:12764
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/378680
Reviewed-by: Evan Shrubsole <eshr@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43975}

api/media_types.h

diff --git a/api/media_types.h b/api/media_types.h
index b2ff08c..430bab5 100644
--- a/api/media_types.h
+++ b/api/media_types.h
@@ -15,16 +15,23 @@
 
 #include "rtc_base/system/rtc_export.h"
 
+namespace webrtc {
+
+enum class MediaType { AUDIO, VIDEO, DATA, UNSUPPORTED, ANY };
+
+}  // namespace webrtc
+
 // The cricket and webrtc have separate definitions for what a media type is.
-// They're not compatible. Watch out for this.
+// They used to be incompatible, but now cricket is defined in terms of the
+// webrtc definition.
 
 namespace cricket {
 
 enum MediaType {
-  MEDIA_TYPE_AUDIO,
-  MEDIA_TYPE_VIDEO,
-  MEDIA_TYPE_DATA,
-  MEDIA_TYPE_UNSUPPORTED
+  MEDIA_TYPE_AUDIO = static_cast<int>(webrtc::MediaType::AUDIO),
+  MEDIA_TYPE_VIDEO = static_cast<int>(webrtc::MediaType::VIDEO),
+  MEDIA_TYPE_DATA = static_cast<int>(webrtc::MediaType::DATA),
+  MEDIA_TYPE_UNSUPPORTED = static_cast<int>(webrtc::MediaType::UNSUPPORTED),
 };
 
 extern const char kMediaTypeAudio[];
@@ -35,10 +42,4 @@
 
 }  // namespace cricket
 
-namespace webrtc {
-
-enum class MediaType { ANY, AUDIO, VIDEO, DATA };
-
-}  // namespace webrtc
-
 #endif  // API_MEDIA_TYPES_H_

media/BUILD.gn

diff --git a/media/BUILD.gn b/media/BUILD.gn
index 0564eb7..3c42089 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -822,6 +822,7 @@
       "../api:call_api",
       "../api:fec_controller_api",
       "../api:frame_transformer_interface",
+      "../api:make_ref_counted",
       "../api:rtc_error",
       "../api:rtp_headers",
       "../api:rtp_parameters",

media/engine/fake_webrtc_call.cc

diff --git a/media/engine/fake_webrtc_call.cc b/media/engine/fake_webrtc_call.cc
index 551b452..f866060 100644
--- a/media/engine/fake_webrtc_call.cc
+++ b/media/engine/fake_webrtc_call.cc
@@ -10,21 +10,51 @@
 
 #include "media/engine/fake_webrtc_call.h"
 
+#include <cstddef>
 #include <cstdint>
+#include <map>
+#include <string>
 #include <utility>
+#include <vector>
 
 #include "absl/algorithm/container.h"
 #include "absl/strings/string_view.h"
+#include "api/adaptation/resource.h"
+#include "api/audio_codecs/audio_format.h"
 #include "api/call/audio_sink.h"
+#include "api/crypto/frame_decryptor_interface.h"
 #include "api/environment/environment.h"
+#include "api/frame_transformer_interface.h"
+#include "api/make_ref_counted.h"
+#include "api/media_types.h"
+#include "api/rtc_error.h"
+#include "api/rtp_headers.h"
+#include "api/rtp_parameters.h"
+#include "api/rtp_sender_interface.h"
+#include "api/scoped_refptr.h"
+#include "api/task_queue/task_queue_base.h"
 #include "api/units/timestamp.h"
+#include "api/video/video_source_interface.h"
+#include "api/video_codecs/video_codec.h"
+#include "api/video_codecs/video_encoder.h"
+#include "call/audio_receive_stream.h"
+#include "call/audio_send_stream.h"
+#include "call/call.h"
+#include "call/flexfec_receive_stream.h"
 #include "call/packet_receiver.h"
+#include "call/video_receive_stream.h"
+#include "call/video_send_stream.h"
 #include "media/base/media_channel.h"
+#include "modules/rtp_rtcp/source/rtp_packet_received.h"
 #include "modules/rtp_rtcp/source/rtp_util.h"
+#include "rtc_base/buffer.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/gunit.h"
+#include "rtc_base/copy_on_write_buffer.h"
+#include "rtc_base/network/sent_packet.h"
 #include "rtc_base/thread.h"
+#include "test/gtest.h"
 #include "video/config/encoder_stream_factory.h"
+#include "video/config/video_encoder_config.h"
 
 namespace cricket {
 
@@ -522,6 +552,7 @@
       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;
   }
@@ -722,6 +753,7 @@
       break;
     case webrtc::MediaType::DATA:
     case webrtc::MediaType::ANY:
+    case webrtc::MediaType::UNSUPPORTED:
       ADD_FAILURE()
           << "SignalChannelNetworkState called with unknown parameter.";
   }