Remove the deprecated rtc_media_base build target. Also remove the associated header file that are just redirecting to api/video. Change-Id: I847cdd78a63e786ecc72b478f2cdfdeaecc72ada Bug: webrtc:42225070 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/486820 Commit-Queue: Jeremy Leconte <jleconte@google.com> Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/main@{#48117}
diff --git a/PRESUBMIT.py b/PRESUBMIT.py index f8dbc91..15b43af 100755 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py
@@ -25,7 +25,6 @@ 'common_types.h', 'examples/objc', 'media/base/stream_params.h', - 'media/base/video_common.h', 'modules/audio_coding', 'modules/audio_device', 'modules/audio_processing',
diff --git a/media/BUILD.gn b/media/BUILD.gn index 82ed3bf..9b7a757 100644 --- a/media/BUILD.gn +++ b/media/BUILD.gn
@@ -13,10 +13,7 @@ group("media") { deps = [] if (!build_with_mozilla) { - deps += [ - ":rtc_media", - ":rtc_media_base", - ] + deps += [ ":rtc_media" ] } } @@ -45,90 +42,6 @@ "//third_party/abseil-cpp/absl/algorithm:container", ] } - -rtc_library("rtc_media_base") { - visibility = [ "*" ] - defines = [] - libs = [] - sources = [ - "base/adapted_video_track_source.h", # Used downstream - "base/video_adapter.h", # Used once downstream - "base/video_broadcaster.h", # Used downstream - "base/video_common.h", # Used downstream - ] - deps = [ - ":codec", - ":media_channel", - ":media_channel_impl", - ":rid_description", - ":rtc_media_config", - ":rtp_utils", - ":stream_params", - ":video_source_base", - "../api:audio_options_api", - "../api:call_api", - "../api:field_trials_view", - "../api:frame_transformer_interface", - "../api:media_stream_interface", - "../api:rtc_error", - "../api:rtp_parameters", - "../api:rtp_sender_interface", - "../api:scoped_refptr", - "../api:sequence_checker", - "../api:transport_api", - "../api:video_track_source_constraints", - "../api/audio:audio_frame_processor", - "../api/audio_codecs:audio_codecs_api", - "../api/crypto:frame_decryptor_interface", - "../api/crypto:frame_encryptor_interface", - "../api/crypto:options", - "../api/task_queue", - "../api/task_queue:pending_task_safety_flag", - "../api/transport:datagram_transport_interface", - "../api/transport:stun_types", - "../api/transport/rtp:rtp_source", - "../api/units:time_delta", - "../api/video:adapted_video_track_source", - "../api/video:recordable_encoded_frame", - "../api/video:resolution", - "../api/video:video_adapter", - "../api/video:video_bitrate_allocation", - "../api/video:video_bitrate_allocator_factory", - "../api/video:video_broadcaster", - "../api/video:video_common", - "../api/video:video_frame", - "../api/video:video_rtp_headers", - "../api/video_codecs:scalability_mode", - "../api/video_codecs:video_codecs_api", - "../call:call_interfaces", - "../common_video", - "../modules/async_audio_processing", - "../modules/audio_device", - "../modules/rtp_rtcp:rtp_rtcp_format", - "../rtc_base:async_packet_socket", - "../rtc_base:buffer", - "../rtc_base:byte_order", - "../rtc_base:checks", - "../rtc_base:copy_on_write_buffer", - "../rtc_base:dscp", - "../rtc_base:logging", - "../rtc_base:macromagic", - "../rtc_base:network_route", - "../rtc_base:sanitizer", - "../rtc_base:socket", - "../rtc_base:stringutils", - "../rtc_base:timeutils", - "../rtc_base:unique_id_generator", - "../rtc_base/network:sent_packet", - "../rtc_base/synchronization:mutex", - "../rtc_base/system:file_wrapper", - "../rtc_base/system:no_unique_address", - "../rtc_base/system:rtc_export", - "../video/config:encoder_config", - "//third_party/abseil-cpp/absl/base:core_headers", - ] -} - rtc_source_set("audio_source") { sources = [ "base/audio_source.h" ] } @@ -891,7 +804,6 @@ ":rid_description", ":rtc_audio_video", ":rtc_internal_video_codecs", - ":rtc_media_base", ":rtc_media_config", ":rtc_media_tests_utils", ":rtc_sdp_video_format_utils",
diff --git a/media/base/adapted_video_track_source.h b/media/base/adapted_video_track_source.h deleted file mode 100644 index 531dc66..0000000 --- a/media/base/adapted_video_track_source.h +++ /dev/null
@@ -1,16 +0,0 @@ -/* - * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#ifndef MEDIA_BASE_ADAPTED_VIDEO_TRACK_SOURCE_H_ -#define MEDIA_BASE_ADAPTED_VIDEO_TRACK_SOURCE_H_ - -#include "api/video/adapted_video_track_source.h" - -#endif // MEDIA_BASE_ADAPTED_VIDEO_TRACK_SOURCE_H_
diff --git a/media/base/video_adapter.h b/media/base/video_adapter.h deleted file mode 100644 index 1a5f4f0..0000000 --- a/media/base/video_adapter.h +++ /dev/null
@@ -1,16 +0,0 @@ -/* - * Copyright (c) 2010 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#ifndef MEDIA_BASE_VIDEO_ADAPTER_H_ -#define MEDIA_BASE_VIDEO_ADAPTER_H_ - -#include "api/video/video_adapter.h" - -#endif // MEDIA_BASE_VIDEO_ADAPTER_H_
diff --git a/media/base/video_broadcaster.h b/media/base/video_broadcaster.h deleted file mode 100644 index 43be476..0000000 --- a/media/base/video_broadcaster.h +++ /dev/null
@@ -1,16 +0,0 @@ -/* - * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#ifndef MEDIA_BASE_VIDEO_BROADCASTER_H_ -#define MEDIA_BASE_VIDEO_BROADCASTER_H_ - -#include "api/video/video_broadcaster.h" - -#endif // MEDIA_BASE_VIDEO_BROADCASTER_H_
diff --git a/media/base/video_common.h b/media/base/video_common.h deleted file mode 100644 index 7ca3d4b..0000000 --- a/media/base/video_common.h +++ /dev/null
@@ -1,16 +0,0 @@ -/* - * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#ifndef MEDIA_BASE_VIDEO_COMMON_H_ -#define MEDIA_BASE_VIDEO_COMMON_H_ - -#include "api/video/video_common.h" - -#endif // MEDIA_BASE_VIDEO_COMMON_H_ \ No newline at end of file
diff --git a/modules/video_capture/BUILD.gn b/modules/video_capture/BUILD.gn index 0fffdf2..7198d72 100644 --- a/modules/video_capture/BUILD.gn +++ b/modules/video_capture/BUILD.gn
@@ -89,10 +89,7 @@ "linux/video_capture_v4l2.cc", "linux/video_capture_v4l2.h", ] - deps += [ - "../../media:rtc_media_base", - "../../rtc_base:sanitizer", - ] + deps += [ "../../rtc_base:sanitizer" ] if (rtc_use_pipewire) { sources += [ @@ -113,7 +110,6 @@ deps += [ "../../api:refcountedbase", "../../common_video", - "../../media:rtc_media_base", "../portal", ] }
diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn index af9ef7e..3fd3ddb 100644 --- a/modules/video_coding/BUILD.gn +++ b/modules/video_coding/BUILD.gn
@@ -476,9 +476,6 @@ } else { deps += [ "//third_party/openh264:encoder" ] } - if (!build_with_mozilla) { - deps += [ "../../media:rtc_media_base" ] - } } }
diff --git a/pc/BUILD.gn b/pc/BUILD.gn index 32d97ed..4018fa4 100644 --- a/pc/BUILD.gn +++ b/pc/BUILD.gn
@@ -1958,7 +1958,6 @@ "../api/video:recordable_encoded_frame", "../api/video:video_broadcaster", "../api/video:video_frame", - "../media:rtc_media_base", "../rtc_base:checks", "../rtc_base:macromagic", "../rtc_base/synchronization:mutex", @@ -4489,7 +4488,6 @@ "../call:payload_type_picker", "../media:codec", "../media:media_channel", - "../media:rtc_media_base", "../media:rtc_media_tests_utils", "../media:rtc_simulcast_encoder_adapter", "../media:stream_params",
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn index b7f8a41..73663ef 100644 --- a/sdk/BUILD.gn +++ b/sdk/BUILD.gn
@@ -476,7 +476,6 @@ "../api/video:video_frame", "../api/video:video_rtp_headers", "../common_video", - "../media:rtc_media_base", "../rtc_base:checks", "../rtc_base:logging", ] @@ -582,7 +581,6 @@ "../api/video:video_frame", "../api/video:video_rtp_headers", "../common_video", - "../media:rtc_media_base", "../pc:video_track_source_proxy", "../rtc_base:checks", "../rtc_base:threading", @@ -740,7 +738,6 @@ "../api/video_codecs:video_codecs_api", "../common_video", "../media:media_constants", - "../media:rtc_media_base", "../modules/video_coding:video_codec_interface", "../rtc_base:checks", ] @@ -791,7 +788,6 @@ deps = [ ":base_objc", "../media:media_constants", - "../media:rtc_media_base", ] } @@ -851,7 +847,6 @@ ":base_objc", ":wrapped_native_codec_objc", "../api/video_codecs:video_codecs_api", - "../media:rtc_media_base", "../modules/video_coding/codecs/av1:dav1d_decoder", ] } @@ -1155,7 +1150,6 @@ "../api/video_codecs:video_codecs_api", "../common_video", "../media:media_constants", - "../media:rtc_media_base", "../modules/video_coding:video_codec_interface", "../pc:peer_connection_factory", "../pc:webrtc_sdp", @@ -1260,7 +1254,6 @@ "../api/video_codecs:video_codecs_api", "../common_video", "../media:codec", - "../media:rtc_media_base", "../media:rtc_media_tests_utils", "../modules/video_coding:video_codec_interface", "../rtc_base:refcount", @@ -1761,7 +1754,6 @@ "../common_video", "../media:codec", "../media:rtc_audio_video", - "../media:rtc_media_base", "../modules/video_coding:video_codec_interface", "../rtc_base:checks", "../rtc_base:logging",
diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn index e947ec0..8e81ce1 100644 --- a/sdk/android/BUILD.gn +++ b/sdk/android/BUILD.gn
@@ -749,7 +749,6 @@ "../../api/video_codecs:rtc_software_fallback_wrappers", "../../api/video_codecs:video_codecs_api", "../../common_video", - "../../media:rtc_media_base", "../../modules/video_coding:codec_globals_headers", "../../modules/video_coding:video_codec_interface", "../../modules/video_coding:video_coding_utility", @@ -900,7 +899,6 @@ "../../api/transport:network_control", "../../api/video_codecs:video_codecs_api", "../../call:call_interfaces", - "../../media:rtc_media_base", "../../modules/audio_device", "../../modules/utility", "../../p2p:port",
diff --git a/video/BUILD.gn b/video/BUILD.gn index 6012f821..58dc21e 100644 --- a/video/BUILD.gn +++ b/video/BUILD.gn
@@ -186,10 +186,6 @@ "//third_party/abseil-cpp/absl/memory", "//third_party/abseil-cpp/absl/strings", ] - - if (!build_with_mozilla) { - deps += [ "../media:rtc_media_base" ] - } } rtc_library("null_video_decoder") { @@ -467,6 +463,7 @@ "../call/adaptation:resource_adaptation", "../common_video", "../media:media_channel", + "../media:media_channel_impl", "../modules:module_api_public", "../modules/video_coding", "../modules/video_coding:codec_globals_headers",
diff --git a/video/config/BUILD.gn b/video/config/BUILD.gn index 3f1ce41..6e0ac91 100644 --- a/video/config/BUILD.gn +++ b/video/config/BUILD.gn
@@ -26,7 +26,6 @@ "../../api/video_codecs:video_codecs_api", "../../call/adaptation:resource_adaptation", "../../media:media_constants", - "../../media:rtc_media_base", "../../modules/video_coding:video_coding_utility", "../../modules/video_coding:webrtc_vp9_helpers", "../../rtc_base:checks", @@ -88,8 +87,5 @@ "../../test:test_support", "//third_party/abseil-cpp/absl/strings:string_view", ] - if (!build_with_mozilla) { - deps += [ "../../media:rtc_media_base" ] - } } }
diff --git a/video/g3doc/adaptation.md b/video/g3doc/adaptation.md index 859fc9a..3b2d68c 100644 --- a/video/g3doc/adaptation.md +++ b/video/g3doc/adaptation.md
@@ -111,4 +111,4 @@ [bitrate_constraint.h]: https://source.chromium.org/chromium/chromium/src/+/main:third_party/webrtc/video/adaptation/bitrate_constraint.h [AddOrUpdateSink]: https://source.chromium.org/chromium/chromium/src/+/main:third_party/webrtc/api/video/video_source_interface.h?q=AddOrUpdateSink [VideoSinkWants]: https://source.chromium.org/chromium/chromium/src/+/main:third_party/webrtc/api/video/video_source_interface.h?q=%22RTC_EXPORT%20VideoSinkWants%22 -[adapted_video_track_source.h]: https://source.chromium.org/chromium/chromium/src/+/main:third_party/webrtc/media/base/adapted_video_track_source.h +[adapted_video_track_source.h]: https://source.chromium.org/chromium/chromium/src/+/main:third_party/webrtc/api/video/adapted_video_track_source.h