diff --git a/api/BUILD.gn b/api/BUILD.gn
index cf86d5486e..16a55f36b4 100644
--- a/api/BUILD.gn
+++ b/api/BUILD.gn
@@ -374,7 +374,6 @@ rtc_library("libjingle_peerconnection_api") {
     # Basically, don't add stuff here. You might break sensitive downstream
     # targets like pnacl. API should not depend on anything outside of this
     # file, really. All these should arguably go away in time.
-    "../media:rtc_media_base",
     "../media:rtc_media_config",
     "../modules/audio_processing:audio_processing_statistics",
     "../rtc_base:checks",
@@ -586,7 +585,6 @@ rtc_source_set("peer_connection_quality_test_fixture_api") {
     ":track_id_stream_info_map",
     ":video_quality_analyzer_api",
     "../media:media_constants",
-    "../media:rtc_media_base",
     "../modules/audio_processing:api",
     "../rtc_base:checks",
     "../rtc_base:network",
diff --git a/api/video_codecs/BUILD.gn b/api/video_codecs/BUILD.gn
index 3310a51c56..c731bfa2a8 100644
--- a/api/video_codecs/BUILD.gn
+++ b/api/video_codecs/BUILD.gn
@@ -154,7 +154,6 @@ rtc_library("builtin_video_encoder_factory") {
     "../../media:codec",
     "../../media:media_constants",
     "../../media:rtc_internal_video_codecs",
-    "../../media:rtc_media_base",
     "../../media:rtc_simulcast_encoder_adapter",
     "../../rtc_base:checks",
     "../../rtc_base/system:rtc_export",
@@ -311,7 +310,7 @@ rtc_library("rtc_software_fallback_wrappers") {
     "../../api/environment",
     "../../api/transport:field_trial_based_config",
     "../../api/video:video_frame",
-    "../../media:rtc_media_base",
+    "../../media:video_common",
     "../../modules/video_coding:video_codec_interface",
     "../../modules/video_coding:video_coding_utility",
     "../../rtc_base:checks",
diff --git a/api/video_codecs/test/BUILD.gn b/api/video_codecs/test/BUILD.gn
index 97371b91bb..6b749aa749 100644
--- a/api/video_codecs/test/BUILD.gn
+++ b/api/video_codecs/test/BUILD.gn
@@ -33,7 +33,6 @@ if (rtc_include_tests) {
       "../..:mock_video_encoder",
       "../../../api:scoped_refptr",
       "../../../media:media_constants",
-      "../../../media:rtc_media_base",
       "../../../modules/video_coding:video_codec_interface",
       "../../../modules/video_coding:video_coding_utility",
       "../../../modules/video_coding:webrtc_vp8",
diff --git a/audio/BUILD.gn b/audio/BUILD.gn
index 8679790903..536e192b92 100644
--- a/audio/BUILD.gn
+++ b/audio/BUILD.gn
@@ -71,7 +71,7 @@ rtc_library("audio") {
     "../logging:rtc_event_audio",
     "../logging:rtc_stream_config",
     "../media:media_channel",
-    "../media:rtc_media_base",
+    "../media:media_channel_impl",
     "../modules/async_audio_processing",
     "../modules/audio_coding",
     "../modules/audio_coding:audio_coding_module_typedefs",
diff --git a/examples/BUILD.gn b/examples/BUILD.gn
index 2eda75191d..026c974fc1 100644
--- a/examples/BUILD.gn
+++ b/examples/BUILD.gn
@@ -697,7 +697,7 @@ if (is_linux || is_chromeos || is_win) {
       "../api/video:video_rtp_headers",
       "../api/video_codecs:video_codecs_api",
       "../media:media_channel",
-      "../media:rtc_media_base",
+      "../media:video_common",
       "../p2p:connection",
       "../p2p:port_allocator",
       "../p2p:rtc_p2p",
@@ -729,7 +729,6 @@ if (is_linux || is_chromeos || is_win) {
       ]
       configs += [ "//build/config/win:windowed" ]
       deps += [
-        "../media:rtc_media_base",
         "../rtc_base:win32",
         "../rtc_base:win32_socket_init",
       ]
diff --git a/media/BUILD.gn b/media/BUILD.gn
index ee99e582f1..204212815b 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -53,16 +53,13 @@ rtc_library("rtc_media_base") {
   defines = []
   libs = []
   sources = [
-    "base/adapted_video_track_source.cc",
     "base/adapted_video_track_source.h",  # Used downstream
-    "base/video_adapter.cc",
     "base/video_adapter.h",  # Used once downstream
-    "base/video_broadcaster.cc",
     "base/video_broadcaster.h",  # Used downstream
-    "base/video_common.cc",
     "base/video_common.h",  # Used downstream
   ]
   deps = [
+    ":adapted_video_track_source",
     ":codec",
     ":media_channel",
     ":media_channel_impl",
@@ -70,6 +67,9 @@ rtc_library("rtc_media_base") {
     ":rtc_media_config",
     ":rtp_utils",
     ":stream_params",
+    ":video_adapter",
+    ":video_broadcaster",
+    ":video_common",
     ":video_source_base",
     "../api:array_view",
     "../api:audio_options_api",
@@ -140,9 +140,52 @@ rtc_library("rtc_media_base") {
   ]
 }
 
+rtc_library("adapted_video_track_source") {
+  sources = [
+    "base/adapted_video_track_source.cc",
+    "base/adapted_video_track_source.h",
+  ]
+  deps = [
+    ":video_adapter",
+    ":video_broadcaster",
+    "../api:media_stream_interface",
+    "../api:scoped_refptr",
+    "../api/video:video_frame",
+    "../api/video:video_rtp_headers",
+    "../rtc_base:checks",
+    "../rtc_base:macromagic",
+    "../rtc_base:timeutils",
+    "../rtc_base/synchronization:mutex",
+    "../rtc_base/system:rtc_export",
+  ]
+  absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
+}
+
 rtc_source_set("audio_source") {
   sources = [ "base/audio_source.h" ]
   absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
+  deps = []
+}
+
+rtc_library("video_adapter") {
+  sources = [
+    "base/video_adapter.cc",
+    "base/video_adapter.h",
+  ]
+  deps = [
+    ":video_common",
+    "../api/video:video_frame",
+    "../common_video",
+    "../rtc_base:checks",
+    "../rtc_base:logging",
+    "../rtc_base:macromagic",
+    "../rtc_base:stringutils",
+    "../rtc_base:timeutils",
+    "../rtc_base/synchronization:mutex",
+    "../rtc_base/system:rtc_export",
+    "../system_wrappers:field_trial",
+  ]
+  absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
 }
 
 rtc_library("video_source_base") {
@@ -159,6 +202,42 @@ rtc_library("video_source_base") {
   absl_deps = [ "//third_party/abseil-cpp/absl/algorithm:container" ]
 }
 
+rtc_library("video_broadcaster") {
+  sources = [
+    "base/video_broadcaster.cc",
+    "base/video_broadcaster.h",  # Used downstream
+  ]
+  deps = [
+    ":video_common",
+    ":video_source_base",
+    "../api:media_stream_interface",
+    "../api:scoped_refptr",
+    "../api:sequence_checker",
+    "../api/video:video_frame",
+    "../api/video:video_rtp_headers",
+    "../rtc_base:checks",
+    "../rtc_base:logging",
+    "../rtc_base:macromagic",
+    "../rtc_base/synchronization:mutex",
+  ]
+  absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
+}
+
+rtc_library("video_common") {
+  sources = [
+    "base/video_common.cc",
+    "base/video_common.h",
+  ]
+  deps = [
+    "../api:array_view",
+    "../rtc_base:checks",
+    "../rtc_base:macromagic",
+    "../rtc_base:stringutils",
+    "../rtc_base:timeutils",
+    "../rtc_base/system:rtc_export",
+  ]
+}
+
 rtc_library("media_engine") {
   sources = [
     "base/media_engine.cc",
@@ -168,8 +247,8 @@ rtc_library("media_engine") {
     ":codec",
     ":media_channel",
     ":media_channel_impl",
-    ":rtc_media_base",
     ":rtc_media_config",
+    ":video_common",
     "../api:field_trials_view",
     "../api:rtp_parameters",
     "../api/audio_codecs:audio_codecs_api",
@@ -379,8 +458,8 @@ rtc_library("rtc_simulcast_encoder_adapter") {
     "engine/simulcast_encoder_adapter.h",
   ]
   deps = [
-    ":rtc_media_base",
     ":rtc_sdp_video_format_utils",
+    ":video_common",
     "../api:fec_controller_api",
     "../api:field_trials_view",
     "../api:scoped_refptr",
@@ -418,7 +497,6 @@ rtc_library("rtc_internal_video_codecs") {
   deps = [
     ":codec",
     ":media_constants",
-    ":rtc_media_base",
     ":rtc_simulcast_encoder_adapter",
     "../api/environment",
     "../api/video:encoded_image",
@@ -481,7 +559,6 @@ rtc_library("rtc_audio_video") {
     ":media_constants",
     ":media_engine",
     ":rid_description",
-    ":rtc_media_base",
     ":rtc_media_config",
     ":rtp_utils",
     ":stream_params",
@@ -625,7 +702,6 @@ rtc_source_set("rtc_data_sctp_transport_internal") {
     ":media_channel",
     "../api:rtc_error",
     "../api/transport:datagram_transport_interface",
-    "../media:rtc_media_base",
     "../p2p:packet_transport_internal",
     "../p2p:rtc_p2p",
     "../rtc_base:copy_on_write_buffer",
@@ -646,7 +722,6 @@ if (rtc_build_dcsctp) {
       "../api/environment",
       "../api/task_queue:pending_task_safety_flag",
       "../api/task_queue:task_queue",
-      "../media:rtc_media_base",
       "../net/dcsctp/public:factory",
       "../net/dcsctp/public:socket",
       "../net/dcsctp/public:types",
@@ -724,10 +799,10 @@ if (rtc_include_tests) {
       ":rtc_audio_video",
       ":rtc_internal_video_codecs",
       ":rtc_media",
-      ":rtc_media_base",
       ":rtc_simulcast_encoder_adapter",
       ":rtp_utils",
       ":stream_params",
+      ":video_common",
       "../api:call_api",
       "../api:fec_controller_api",
       "../api:rtp_parameters",
@@ -827,13 +902,15 @@ if (rtc_include_tests) {
         ":rtc_audio_video",
         ":rtc_internal_video_codecs",
         ":rtc_media",
-        ":rtc_media_base",
         ":rtc_media_tests_utils",
         ":rtc_sdp_video_format_utils",
         ":rtc_simulcast_encoder_adapter",
         ":rtp_utils",
         ":stream_params",
         ":turn_utils",
+        ":video_adapter",
+        ":video_broadcaster",
+        ":video_common",
         "../api:create_simulcast_test_fixture_api",
         "../api:field_trials_view",
         "../api:libjingle_peerconnection_api",
diff --git a/modules/video_capture/BUILD.gn b/modules/video_capture/BUILD.gn
index b583814ebe..b8345841fa 100644
--- a/modules/video_capture/BUILD.gn
+++ b/modules/video_capture/BUILD.gn
@@ -33,7 +33,6 @@ rtc_library("video_capture_module") {
     "../../api/video:video_frame",
     "../../api/video:video_rtp_headers",
     "../../common_video",
-    "../../media:rtc_media_base",
     "../../rtc_base:event_tracer",
     "../../rtc_base:logging",
     "../../rtc_base:macromagic",
@@ -56,6 +55,7 @@ if (!build_with_chromium || is_linux || is_chromeos) {
       ":video_capture_module",
       "../../api:scoped_refptr",
       "../../api:sequence_checker",
+      "../../media:video_common",
       "../../rtc_base:checks",
       "../../rtc_base:logging",
       "../../rtc_base:macromagic",
diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index 0e8c04a370..0d98fd1216 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -648,7 +648,7 @@ rtc_library("webrtc_vp9_helpers") {
     "../../api/video:video_codec_constants",
     "../../api/video_codecs:video_codecs_api",
     "../../common_video",
-    "../../media:rtc_media_base",
+    "../../media:video_common",
     "../../rtc_base:checks",
     "../../rtc_base:logging",
     "../../rtc_base/experiments:stable_target_rate_experiment",
@@ -692,7 +692,6 @@ rtc_library("webrtc_vp9") {
     "../../common_video",
     "../../media:codec",
     "../../media:media_constants",
-    "../../media:rtc_media_base",
     "../../rtc_base:buffer",
     "../../rtc_base:checks",
     "../../rtc_base:event_tracer",
@@ -756,7 +755,6 @@ if (rtc_include_tests) {
         "../../api/video:video_rtp_headers",
         "../../api/video_codecs:video_codecs_api",
         "../../media:rtc_audio_video",
-        "../../media:rtc_media_base",
         "../../sdk:native_api",
         "../../sdk:peerconnectionfactory_base_objc",
         "../../sdk:videocodec_objc",
@@ -937,7 +935,6 @@ if (rtc_include_tests) {
       "../../common_video",
       "../../media:media_constants",
       "../../media:rtc_audio_video",
-      "../../media:rtc_media_base",
       "../../rtc_base:checks",
       "../../rtc_base:logging",
       "../../rtc_base:rtc_base_tests_utils",
@@ -1078,7 +1075,6 @@ if (rtc_include_tests) {
       "../../media:codec",
       "../../media:media_constants",
       "../../media:rtc_internal_video_codecs",
-      "../../media:rtc_media_base",
       "../../media:rtc_simulcast_encoder_adapter",
       "../../rtc_base:refcount",
       "../../rtc_base:stringutils",
@@ -1233,7 +1229,6 @@ if (rtc_include_tests) {
       "../../common_video/test:utilities",
       "../../media:media_constants",
       "../../media:rtc_internal_video_codecs",
-      "../../media:rtc_media_base",
       "../../rtc_base:checks",
       "../../rtc_base:gunit_helpers",
       "../../rtc_base:histogram_percentile_counter",
diff --git a/pc/BUILD.gn b/pc/BUILD.gn
index a333c9160c..029afe8758 100644
--- a/pc/BUILD.gn
+++ b/pc/BUILD.gn
@@ -83,7 +83,6 @@ rtc_source_set("channel") {
     "../media:media_channel",
     "../media:media_channel_impl",
     "../media:rid_description",
-    "../media:rtc_media_base",
     "../media:rtp_utils",
     "../media:stream_params",
     "../modules/rtp_rtcp:rtp_rtcp_format",
@@ -119,7 +118,6 @@ rtc_source_set("channel_interface") {
     "../api:libjingle_peerconnection_api",
     "../api:rtp_parameters",
     "../media:media_channel",
-    "../media:rtc_media_base",
   ]
   absl_deps = [ "//third_party/abseil-cpp/absl/strings" ]
 }
@@ -344,7 +342,6 @@ rtc_source_set("media_factory") {
     "../api/environment",
     "../call:call_interfaces",
     "../media:media_engine",
-    "../media:rtc_media_base",
   ]
 }
 
@@ -371,7 +368,6 @@ rtc_source_set("media_session") {
     "../media:media_engine",
     "../media:rid_description",
     "../media:rtc_data_sctp_transport_internal",
-    "../media:rtc_media_base",
     "../media:rtc_sdp_video_format_utils",
     "../media:stream_params",
     "../p2p:ice_credentials_iterator",
@@ -489,7 +485,6 @@ rtc_source_set("rtp_transport") {
     "../api/units:timestamp",
     "../call:rtp_receiver",
     "../call:video_stream_api",
-    "../media:rtc_media_base",
     "../media:rtp_utils",
     "../modules/rtp_rtcp:rtp_rtcp_format",
     "../p2p:packet_transport_internal",
@@ -567,7 +562,6 @@ rtc_source_set("sctp_utils") {
     "../api/transport:datagram_transport_interface",
     "../media:media_channel",
     "../media:rtc_data_sctp_transport_internal",
-    "../media:rtc_media_base",
     "../net/dcsctp/public:types",
     "../rtc_base:byte_buffer",
     "../rtc_base:copy_on_write_buffer",
@@ -619,7 +613,6 @@ rtc_source_set("srtp_transport") {
     "../api:field_trials_view",
     "../api:libjingle_peerconnection_api",
     "../api:rtc_error",
-    "../media:rtc_media_base",
     "../media:rtp_utils",
     "../modules/rtp_rtcp:rtp_rtcp_format",
     "../p2p:packet_transport_internal",
@@ -666,7 +659,6 @@ rtc_source_set("used_ids") {
   deps = [
     "../api:rtp_parameters",
     "../media:codec",
-    "../media:rtc_media_base",
     "../rtc_base:checks",
     "../rtc_base:logging",
   ]
@@ -709,7 +701,6 @@ rtc_source_set("session_description") {
     "../media:media_channel",
     "../media:media_constants",
     "../media:rid_description",
-    "../media:rtc_media_base",
     "../media:stream_params",
     "../p2p:rtc_p2p",
     "../p2p:transport_description",
@@ -775,7 +766,6 @@ rtc_library("sctp_data_channel") {
     "../api/transport:datagram_transport_interface",
     "../media:media_channel",
     "../media:rtc_data_sctp_transport_internal",
-    "../media:rtc_media_base",
     "../rtc_base:checks",
     "../rtc_base:copy_on_write_buffer",
     "../rtc_base:logging",
@@ -801,7 +791,6 @@ rtc_library("data_channel_utils") {
   deps = [
     "../api:libjingle_peerconnection_api",
     "../media:media_engine",
-    "../media:rtc_media_base",
     "../rtc_base:checks",
   ]
 }
@@ -824,7 +813,6 @@ rtc_library("connection_context") {
     "../api/transport:sctp_transport_factory_interface",
     "../media:media_engine",
     "../media:rtc_data_sctp_transport_factory",
-    "../media:rtc_media_base",
     "../p2p:basic_packet_socket_factory",
     "../p2p:rtc_p2p",
     "../rtc_base:checks",
@@ -858,7 +846,6 @@ rtc_source_set("data_channel_controller") {
     "../api/task_queue:pending_task_safety_flag",
     "../api/transport:datagram_transport_interface",
     "../media:media_channel",
-    "../media:rtc_media_base",
     "../rtc_base:checks",
     "../rtc_base:copy_on_write_buffer",
     "../rtc_base:logging",
@@ -931,7 +918,6 @@ rtc_source_set("rtc_stats_collector") {
     "../common_video:common_video",
     "../media:media_channel",
     "../media:media_channel_impl",
-    "../media:rtc_media_base",
     "../modules/audio_device",
     "../modules/audio_processing:audio_processing_statistics",
     "../modules/rtp_rtcp:rtp_rtcp_format",
@@ -1031,7 +1017,6 @@ rtc_source_set("sdp_offer_answer") {
     "../media:codec",
     "../media:media_channel",
     "../media:rid_description",
-    "../media:rtc_media_base",
     "../media:stream_params",
     "../p2p:connection",
     "../p2p:ice_transport_internal",
@@ -1144,7 +1129,6 @@ rtc_source_set("peer_connection") {
     "../media:media_channel",
     "../media:media_engine",
     "../media:rid_description",
-    "../media:rtc_media_base",
     "../media:rtc_media_config",
     "../media:stream_params",
     "../modules/rtp_rtcp:rtp_rtcp_format",
@@ -1195,7 +1179,6 @@ rtc_source_set("simulcast_sdp_serializer") {
     ":simulcast_description",
     "../api:rtc_error",
     "../media:rid_description",
-    "../media:rtc_media_base",
     "../modules/rtp_rtcp:rtp_rtcp_format",
     "../rtc_base:checks",
     "../rtc_base:stringutils",
@@ -1249,7 +1232,6 @@ rtc_source_set("legacy_stats_collector") {
     "../api/video:video_rtp_headers",
     "../call:call_interfaces",
     "../media:media_channel",
-    "../media:rtc_media_base",
     "../modules/audio_processing:audio_processing_statistics",
     "../p2p:connection",
     "../p2p:connection_info",
@@ -1293,7 +1275,6 @@ rtc_source_set("track_media_info_map") {
     "../api:rtp_parameters",
     "../api:scoped_refptr",
     "../media:media_channel",
-    "../media:rtc_media_base",
     "../media:stream_params",
     "../rtc_base:checks",
     "../rtc_base:refcount",
@@ -1326,7 +1307,6 @@ rtc_source_set("webrtc_sdp") {
     "../media:media_constants",
     "../media:rid_description",
     "../media:rtc_data_sctp_transport_internal",
-    "../media:rtc_media_base",
     "../media:rtp_utils",
     "../media:stream_params",
     "../p2p:candidate_pair_interface",
@@ -1466,7 +1446,6 @@ rtc_source_set("peer_connection_factory") {
     "../call:rtp_interfaces",
     "../call:rtp_sender",
     "../media:media_engine",
-    "../media:rtc_media_base",
     "../p2p:basic_packet_socket_factory",
     "../p2p:basic_port_allocator",
     "../p2p:connection",
@@ -1563,7 +1542,6 @@ rtc_library("rtp_transceiver") {
     "../media:media_channel_impl",
     "../media:media_constants",
     "../media:media_engine",
-    "../media:rtc_media_base",
     "../media:rtc_media_config",
     "../rtc_base:checks",
     "../rtc_base:logging",
@@ -1607,7 +1585,6 @@ rtc_library("rtp_transmission_manager") {
     "../api:scoped_refptr",
     "../api:sequence_checker",
     "../media:media_channel",
-    "../media:rtc_media_base",
     "../rtc_base:checks",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
@@ -1661,7 +1638,7 @@ rtc_library("rtp_receiver") {
     "../api/crypto:frame_decryptor_interface",
     "../api/video:video_frame",
     "../media:media_channel",
-    "../media:rtc_media_base",
+    "../media:video_broadcaster",
     "../rtc_base:checks",
     "../rtc_base:logging",
     "../rtc_base:threading",
@@ -1697,7 +1674,6 @@ rtc_library("audio_rtp_receiver") {
     "../api/task_queue:pending_task_safety_flag",
     "../api/transport/rtp:rtp_source",
     "../media:media_channel",
-    "../media:rtc_media_base",
     "../rtc_base:checks",
     "../rtc_base:macromagic",
     "../rtc_base:threading",
@@ -1735,7 +1711,6 @@ rtc_library("video_rtp_receiver") {
     "../api/video:recordable_encoded_frame",
     "../api/video:video_frame",
     "../media:media_channel",
-    "../media:rtc_media_base",
     "../rtc_base:checks",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
@@ -1760,7 +1735,7 @@ rtc_library("video_rtp_track_source") {
     "../api:sequence_checker",
     "../api/video:recordable_encoded_frame",
     "../api/video:video_frame",
-    "../media:rtc_media_base",
+    "../media:video_broadcaster",
     "../rtc_base:checks",
     "../rtc_base:macromagic",
     "../rtc_base/synchronization:mutex",
@@ -1795,7 +1770,6 @@ rtc_library("video_track") {
     "../api:scoped_refptr",
     "../api:sequence_checker",
     "../api/video:video_frame",
-    "../media:rtc_media_base",
     "../media:video_source_base",
     "../rtc_base:checks",
     "../rtc_base:macromagic",
@@ -1842,7 +1816,6 @@ rtc_library("remote_audio_source") {
     "../api:sequence_checker",
     "../api/task_queue",
     "../media:media_channel",
-    "../media:rtc_media_base",
     "../rtc_base:checks",
     "../rtc_base:event_tracer",
     "../rtc_base:logging",
@@ -1882,7 +1855,6 @@ rtc_library("rtp_sender") {
     "../media:audio_source",
     "../media:media_channel",
     "../media:media_engine",
-    "../media:rtc_media_base",
     "../rtc_base:checks",
     "../rtc_base:event_tracer",
     "../rtc_base:logging",
@@ -1913,7 +1885,6 @@ rtc_library("rtp_parameters_conversion") {
     "../api:rtp_parameters",
     "../media:codec",
     "../media:media_constants",
-    "../media:rtc_media_base",
     "../media:rtp_utils",
     "../media:stream_params",
     "../rtc_base:checks",
@@ -1985,7 +1956,6 @@ rtc_library("video_track_source") {
     "../api/video:recordable_encoded_frame",
     "../api/video:video_frame",
     "../media:media_channel",
-    "../media:rtc_media_base",
     "../rtc_base:checks",
     "../rtc_base:macromagic",
     "../rtc_base/system:no_unique_address",
@@ -2102,7 +2072,6 @@ if (rtc_include_tests && !build_with_chromium) {
       "../media:media_constants",
       "../media:rid_description",
       "../media:rtc_data_sctp_transport_internal",
-      "../media:rtc_media_base",
       "../media:rtc_media_tests_utils",
       "../modules/rtp_rtcp:rtp_rtcp_format",
       "../p2p:candidate_pair_interface",
@@ -2533,7 +2502,6 @@ if (rtc_include_tests && !build_with_chromium) {
       "../api/video_codecs:video_encoder_factory_template_open_h264_adapter",
       "../call:call_interfaces",
       "../media:rtc_audio_video",
-      "../media:rtc_media_base",
       "../media:rtc_media_tests_utils",
       "../modules/audio_processing",
       "../modules/audio_processing:api",
@@ -2651,7 +2619,6 @@ if (rtc_include_tests && !build_with_chromium) {
       "../call/adaptation:resource_adaptation_test_utilities",
       "../logging:fake_rtc_event_log",
       "../media:media_engine",
-      "../media:rtc_media_base",
       "../media:rtc_media_config",
       "../media:rtc_media_tests_utils",
       "../media:stream_params",
@@ -2810,9 +2777,9 @@ if (rtc_include_tests && !build_with_chromium) {
       "../media:media_channel",
       "../media:media_channel_impl",
       "../media:rtc_media",
-      "../media:rtc_media_base",
       "../media:rtc_media_tests_utils",
       "../media:rtc_simulcast_encoder_adapter",
+      "../media:video_broadcaster",
       "../modules/audio_device",
       "../modules/audio_processing",
       "../modules/audio_processing:api",
diff --git a/rtc_tools/BUILD.gn b/rtc_tools/BUILD.gn
index 4defa98f7c..6fa2bdbce8 100644
--- a/rtc_tools/BUILD.gn
+++ b/rtc_tools/BUILD.gn
@@ -218,7 +218,6 @@ if (!is_component_build) {
       "../call:video_stream_api",
       "../media:media_constants",
       "../media:rtc_audio_video",
-      "../media:rtc_media_base",
       "../rtc_base:rtc_json",
       "../rtc_base:threading",
       "../rtc_base/system:file_wrapper",
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
index 6fa1bd241d..12584c091c 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -1670,6 +1670,7 @@ if (is_ios || is_mac) {
         "../api/video:video_rtp_headers",
         "../api/video_codecs:video_codecs_api",
         "../common_video",
+        "../media:adapted_video_track_source",
         "../media:codec",
         "../media:rtc_audio_video",
         "../media:rtc_media_base",
diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn
index 61af49fa26..0efe76a497 100644
--- a/sdk/android/BUILD.gn
+++ b/sdk/android/BUILD.gn
@@ -1653,7 +1653,6 @@ if (is_android) {
       "../../media:media_engine",
       "../../media:rtc_audio_video",
       "../../media:rtc_internal_video_codecs",
-      "../../media:rtc_media_base",
       "../../modules/audio_device",
       "../../modules/audio_device:mock_audio_device",
       "../../modules/audio_processing:api",
diff --git a/test/BUILD.gn b/test/BUILD.gn
index 36ca545bd5..0cec8cd089 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -61,7 +61,6 @@ rtc_library("frame_generator_impl") {
     "../api/video_codecs:video_codecs_api",
     "../common_video",
     "../media:media_constants",
-    "../media:rtc_media_base",
     "../modules/video_coding:video_codec_interface",
     "../modules/video_coding:video_coding_utility",
     "../modules/video_coding:webrtc_h264",
@@ -123,7 +122,8 @@ rtc_library("test_video_capturer") {
     "../api:scoped_refptr",
     "../api/video:video_frame",
     "../api/video:video_rtp_headers",
-    "../media:rtc_media_base",
+    "../media:video_adapter",
+    "../media:video_broadcaster",
     "../rtc_base/synchronization:mutex",
   ]
 }
@@ -210,7 +210,6 @@ rtc_library("video_test_common") {
     "../api/video:video_rtp_headers",
     "../api/video_codecs:video_codecs_api",
     "../common_video",
-    "../media:rtc_media_base",
     "../rtc_base:checks",
     "../rtc_base:criticalsection",
     "../rtc_base:logging",
@@ -542,7 +541,6 @@ rtc_library("video_test_support") {
     "../api/video:video_frame",
     "../api/video_codecs:video_codecs_api",
     "../common_video",
-    "../media:rtc_media_base",
     "../modules/video_coding:video_codec_interface",
     "../modules/video_coding:video_coding_utility",
     "../modules/video_coding:webrtc_h264",
@@ -746,7 +744,6 @@ if (rtc_include_tests) {
         "../common_video",
         "../media:codec",
         "../media:media_constants",
-        "../media:rtc_media_base",
         "../modules/rtp_rtcp:rtp_rtcp_format",
         "../modules/video_coding:simulcast_test_fixture_impl",
         "../modules/video_coding:video_codec_interface",
diff --git a/test/fuzzers/BUILD.gn b/test/fuzzers/BUILD.gn
index 642b0c8e08..9e1586f352 100644
--- a/test/fuzzers/BUILD.gn
+++ b/test/fuzzers/BUILD.gn
@@ -385,7 +385,6 @@ webrtc_fuzzer_test("turn_unwrap_fuzzer") {
   sources = [ "turn_unwrap_fuzzer.cc" ]
   deps = [
     "../../media",
-    "../../media:rtc_media_base",
     "../../media:turn_utils",
   ]
 }
diff --git a/test/pc/e2e/BUILD.gn b/test/pc/e2e/BUILD.gn
index 22c9ee48d2..3b486ab295 100644
--- a/test/pc/e2e/BUILD.gn
+++ b/test/pc/e2e/BUILD.gn
@@ -576,7 +576,6 @@ if (!build_with_chromium) {
       "../../../api/test/pclf:media_configuration",
       "../../../media:media_constants",
       "../../../media:rid_description",
-      "../../../media:rtc_media_base",
       "../../../p2p:p2p_constants",
       "../../../p2p:rtc_p2p",
       "../../../pc:sdp_utils",
diff --git a/test/peer_scenario/BUILD.gn b/test/peer_scenario/BUILD.gn
index b149a33356..5b429ba089 100644
--- a/test/peer_scenario/BUILD.gn
+++ b/test/peer_scenario/BUILD.gn
@@ -50,7 +50,6 @@ if (rtc_include_tests) {
       "../../api/video_codecs:video_encoder_factory_template_libvpx_vp9_adapter",
       "../../api/video_codecs:video_encoder_factory_template_open_h264_adapter",
       "../../media:rtc_audio_video",
-      "../../media:rtc_media_base",
       "../../media:rtp_utils",
       "../../modules/audio_device:test_audio_device_module",
       "../../modules/rtp_rtcp:rtp_rtcp_format",
diff --git a/test/peer_scenario/tests/BUILD.gn b/test/peer_scenario/tests/BUILD.gn
index fb2948922a..5e72e4e177 100644
--- a/test/peer_scenario/tests/BUILD.gn
+++ b/test/peer_scenario/tests/BUILD.gn
@@ -24,7 +24,6 @@ if (rtc_include_tests) {
       "../../../api:rtc_stats_api",
       "../../../api/units:data_rate",
       "../../../api/units:time_delta",
-      "../../../media:rtc_media_base",
       "../../../media:stream_params",
       "../../../modules/rtp_rtcp:rtp_rtcp_format",
       "../../../pc:media_session",
diff --git a/test/scenario/BUILD.gn b/test/scenario/BUILD.gn
index 819c3c9217..8d85f6e2ca 100644
--- a/test/scenario/BUILD.gn
+++ b/test/scenario/BUILD.gn
@@ -115,7 +115,6 @@ if (rtc_include_tests && !build_with_chromium) {
       "../../media:media_constants",
       "../../media:rtc_audio_video",
       "../../media:rtc_internal_video_codecs",
-      "../../media:rtc_media_base",
       "../../modules/audio_device",
       "../../modules/audio_device:mock_audio_device",
       "../../modules/audio_device:test_audio_device_module",
diff --git a/video/BUILD.gn b/video/BUILD.gn
index 5efcb58c01..eeabef8b77 100644
--- a/video/BUILD.gn
+++ b/video/BUILD.gn
@@ -432,7 +432,6 @@ rtc_library("video_stream_encoder_impl") {
     "../call/adaptation:resource_adaptation",
     "../common_video",
     "../media:media_channel",
-    "../media:rtc_media_base",
     "../modules:module_api_public",
     "../modules/video_coding",
     "../modules/video_coding:video_codec_interface",
@@ -538,7 +537,6 @@ if (rtc_include_tests) {
         "../media:media_constants",
         "../media:rtc_audio_video",
         "../media:rtc_internal_video_codecs",
-        "../media:rtc_media_base",
         "../media:rtc_simulcast_encoder_adapter",
         "../modules/audio_device:audio_device_api",
         "../modules/audio_device:audio_device_module_from_input_and_output",
@@ -891,9 +889,9 @@ if (rtc_include_tests) {
       "../media:rtc_audio_video",
       "../media:rtc_internal_video_codecs",
       "../media:rtc_media",
-      "../media:rtc_media_base",
       "../media:rtc_media_tests_utils",
       "../media:rtc_simulcast_encoder_adapter",
+      "../media:video_adapter",
       "../modules:module_api_public",
       "../modules/pacing",
       "../modules/rtp_rtcp",
diff --git a/video/config/BUILD.gn b/video/config/BUILD.gn
index 96e254e76b..b20e119bca 100644
--- a/video/config/BUILD.gn
+++ b/video/config/BUILD.gn
@@ -25,7 +25,7 @@ rtc_library("streams_config") {
     "../../api/video_codecs:video_codecs_api",
     "../../call/adaptation:resource_adaptation",
     "../../media:media_constants",
-    "../../media:rtc_media_base",
+    "../../media:video_adapter",
     "../../modules/video_coding:video_coding_utility",
     "../../modules/video_coding:webrtc_vp9_helpers",
     "../../rtc_base:checks",