zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Move api/rtp_headers.h to its own build target."

Browse Source 
This reverts commit a67050debcb5a3461a452a7928d7aaea1562747e.

Reason for revert: breaks downstream projects

Original change's description:
> Move api/rtp_headers.h to its own build target.
> 
> Reduces dependencies on the libjingle_peerconnection_api target from
> lower-level code.
> 
> Bug: None
> Change-Id: I98576fc718c396cc0f720c3770acd2b696b9df89
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/128565
> Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
> Commit-Queue: Niels Moller <nisse@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#27213}

TBR=danilchap@webrtc.org,kwiberg@webrtc.org,nisse@webrtc.org

Change-Id: I8cccaa8be1700ca8db141db7252eb6ce588ba2e0
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: None
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/128645
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Commit-Queue: Steve Anton <steveanton@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27215}
This commit is contained in:
Steve Anton
2019-03-20 16:47:21 +00:00
committed by Commit Bot
parent 7a603394cc
commit 2baef3509f
15 changed files with 16 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
api/BUILD.gn
View File

@ -65,16 +65,6 @@ rtc_static_library("create_peerconnection_factory") {
rtc_source_set("rtp_headers") {
visibility = [ "*" ]
sources = [
"rtp_headers.cc",
"rtp_headers.h",
]
deps = [
":array_view",
"..:webrtc_common",
"video:video_frame",
"//third_party/abseil-cpp/absl/types:optional",
]
}
rtc_static_library("libjingle_peerconnection_api") {
@ -117,6 +107,8 @@ rtc_static_library("libjingle_peerconnection_api") {
"proxy.h",
"rtc_error.cc",
"rtc_error.h",
"rtp_headers.cc",
"rtp_headers.h",
"rtp_parameters.cc",
"rtp_parameters.h",
"rtp_receiver_interface.cc",

1
audio/BUILD.gn
View File

@ -41,7 +41,6 @@ rtc_static_library("audio") {
"../api:array_view",
"../api:call_api",
"../api:libjingle_peerconnection_api",
"../api:rtp_headers",
"../api:scoped_refptr",
"../api:transport_api",
"../api/audio:aec3_factory",

7
call/BUILD.gn
View File

@ -33,7 +33,6 @@ rtc_source_set("call_interfaces") {
"..:webrtc_common",
"../api:fec_controller_api",
"../api:libjingle_peerconnection_api",
"../api:rtp_headers",
"../api:scoped_refptr",
"../api:transport_api",
"../api/audio:audio_mixer_api",
@ -74,7 +73,6 @@ rtc_source_set("rtp_interfaces") {
"../api:array_view",
"../api:fec_controller_api",
"../api:libjingle_peerconnection_api",
"../api:rtp_headers",
"../api/transport:bitrate_settings",
"../logging:rtc_event_log_api",
"../modules/rtp_rtcp:rtp_rtcp_format",
@ -102,7 +100,7 @@ rtc_source_set("rtp_receiver") {
":rtp_interfaces",
"..:webrtc_common",
"../api:array_view",
"../api:rtp_headers",
"../api:libjingle_peerconnection_api",
"../modules/rtp_rtcp",
"../modules/rtp_rtcp:rtp_rtcp_format",
"../rtc_base:checks",
@ -222,7 +220,6 @@ rtc_static_library("call") {
"../api:callfactory_api",
"../api:fec_controller_api",
"../api:libjingle_peerconnection_api",
"../api:rtp_headers",
"../api:simulated_network_api",
"../api:transport_api",
"../api/task_queue:global_task_queue_factory",
@ -271,7 +268,6 @@ rtc_source_set("video_stream_api") {
deps = [
":rtp_interfaces",
"../api:libjingle_peerconnection_api",
"../api:rtp_headers",
"../api:transport_api",
"../api/video:video_frame",
"../api/video:video_stream_encoder",
@ -369,7 +365,6 @@ if (rtc_include_tests) {
"../api:fake_media_transport",
"../api:libjingle_peerconnection_api",
"../api:mock_audio_mixer",
"../api:rtp_headers",
"../api:transport_api",
"../api/audio_codecs:builtin_audio_decoder_factory",
"../api/task_queue:global_task_queue_factory",

5
logging/BUILD.gn
View File

@ -55,7 +55,6 @@ rtc_source_set("rtc_stream_config") {
deps = [
":rtc_event_log_api",
"../api:libjingle_peerconnection_api",
"../api:rtp_headers",
]
}
@ -190,7 +189,6 @@ rtc_static_library("rtc_event_log_impl_encoder") {
deps = [
"../api:libjingle_peerconnection_api",
"../api:rtp_headers",
"../api/transport:network_control",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
@ -329,7 +327,6 @@ if (rtc_enable_protobuf) {
":rtc_event_log_proto",
":rtc_stream_config",
"../api:libjingle_peerconnection_api",
"../api:rtp_headers",
"../api/units:data_rate",
"../api/units:time_delta",
"../api/units:timestamp",
@ -383,7 +380,6 @@ if (rtc_enable_protobuf) {
":rtc_stream_config",
"../api:array_view",
"../api:libjingle_peerconnection_api",
"../api:rtp_headers",
"../call",
"../call:call_interfaces",
"../modules/audio_coding:audio_network_adaptor",
@ -411,7 +407,6 @@ if (rtc_enable_protobuf) {
":rtc_event_log_parser",
"../api:array_view",
"../api:libjingle_peerconnection_api",
"../api:rtp_headers",
"../modules/rtp_rtcp",
"../modules/rtp_rtcp:rtp_rtcp_format",
"../rtc_base:checks",

2
modules/BUILD.gn
View File

@ -51,7 +51,7 @@ rtc_source_set("module_api") {
":module_api_public",
":module_fec_api",
"..:webrtc_common",
"../api:rtp_headers",
"../api:libjingle_peerconnection_api",
"../modules/rtp_rtcp:rtp_video_header",
"../rtc_base:safe_conversions",
"../rtc_base/system:rtc_export",

7
modules/audio_coding/BUILD.gn
View File

@ -960,7 +960,7 @@ rtc_static_library("neteq") {
"..:module_api",
"..:module_api_public",
"../../api:array_view",
"../../api:rtp_headers",
"../../api:libjingle_peerconnection_api",
"../../api:scoped_refptr",
"../../api/audio:audio_frame_api",
"../../api/audio_codecs:audio_codecs_api",
@ -1004,8 +1004,8 @@ rtc_source_set("neteq_tools_minimal") {
deps = [
":neteq",
"../../api:libjingle_peerconnection_api",
"../../api:neteq_simulator_api",
"../../api:rtp_headers",
"../../api/audio:audio_frame_api",
"../../api/audio_codecs:audio_codecs_api",
"../../rtc_base:checks",
@ -1039,7 +1039,7 @@ rtc_source_set("neteq_test_tools") {
deps = [
":pcm16b",
"../../api:array_view",
"../../api:rtp_headers",
"../../api:libjingle_peerconnection_api",
"../../common_audio",
"../../rtc_base:checks",
"../../rtc_base:rtc_base",
@ -1491,6 +1491,7 @@ if (rtc_include_tests) {
deps += [
":isac_fix",
":webrtc_opus",
"../../api:libjingle_peerconnection_api",
"../../rtc_base:rtc_base_approved",
"../../test:test_main",
"../../test:test_support",

4
modules/remote_bitrate_estimator/BUILD.gn
View File

@ -41,7 +41,7 @@ rtc_static_library("remote_bitrate_estimator") {
deps = [
"../..:webrtc_common",
"../../api:rtp_headers",
"../../api:libjingle_peerconnection_api",
"../../api/units:data_rate",
"../../api/units:timestamp",
"../../modules:module_api",
@ -128,7 +128,7 @@ if (rtc_include_tests) {
"..:module_api",
"..:module_api_public",
"../..:webrtc_common",
"../../api:rtp_headers",
"../../api:libjingle_peerconnection_api",
"../../api/transport:field_trial_based_config",
"../../api/transport:network_control",
"../../logging:mocks",

4
modules/rtp_rtcp/BUILD.gn
View File

@ -92,7 +92,6 @@ rtc_source_set("rtp_rtcp_format") {
"../..:webrtc_common",
"../../api:array_view",
"../../api:libjingle_peerconnection_api",
"../../api:rtp_headers",
"../../api/audio_codecs:audio_codecs_api",
"../../api/transport:network_control",
"../../api/video:video_frame",
@ -200,7 +199,6 @@ rtc_static_library("rtp_rtcp") {
"../..:webrtc_common",
"../../api:array_view",
"../../api:libjingle_peerconnection_api",
"../../api:rtp_headers",
"../../api:scoped_refptr",
"../../api:transport_api",
"../../api/audio_codecs:audio_codecs_api",
@ -255,7 +253,7 @@ rtc_source_set("rtcp_transceiver") {
":rtp_rtcp_format",
"../../:webrtc_common",
"../../api:array_view",
"../../api:rtp_headers",
"../../api:libjingle_peerconnection_api",
"../../api:transport_api",
"../../api/video:video_bitrate_allocation",
"../../rtc_base:checks",

1
modules/rtp_rtcp/include/flexfec_sender.h
View File

@ -16,6 +16,7 @@
#include <vector>
#include "api/array_view.h"
#include "api/rtp_parameters.h"
#include "modules/include/module_common_types.h"
#include "modules/rtp_rtcp/include/rtp_header_extension_map.h"
#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"

1
modules/rtp_rtcp/source/rtp_packet.cc
View File

@ -14,6 +14,7 @@
#include <cstring>
#include <utility>
#include "api/rtp_parameters.h"
#include "modules/rtp_rtcp/source/byte_io.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"

1
modules/video_capture/BUILD.gn
View File

@ -29,6 +29,7 @@ rtc_static_library("video_capture_module") {
deps = [
"..:module_api",
"../..:webrtc_common",
"../../api:libjingle_peerconnection_api",
"../../api:scoped_refptr",
"../../api/video:video_frame",
"../../api/video:video_frame_i420",

4
modules/video_coding/BUILD.gn
View File

@ -63,7 +63,7 @@ rtc_static_library("packet") {
deps = [
"..:module_api",
"../../:webrtc_common",
"../../api:rtp_headers",
"../../api:libjingle_peerconnection_api",
"../rtp_rtcp:rtp_rtcp_format",
"../rtp_rtcp:rtp_video_header",
"//third_party/abseil-cpp/absl/types:optional",
@ -74,6 +74,7 @@ rtc_static_library("video_coding") {
visibility = [ "*" ]
deps = [
"..:module_fec_api",
"../../api:libjingle_peerconnection_api",
"../../api:scoped_refptr",
"../../api/video:encoded_image",
"../../api/video:video_bitrate_allocation",
@ -151,7 +152,6 @@ rtc_static_library("video_coding") {
"..:module_api_public",
"../..:webrtc_common",
"../../api:fec_controller_api",
"../../api:rtp_headers",
"../../api/units:data_rate",
"../../api/video:builtin_video_bitrate_allocator_factory",
"../../api/video:encoded_frame",

2
pc/BUILD.gn
View File

@ -78,7 +78,6 @@ rtc_static_library("rtc_pc_base") {
"../api:call_api",
"../api:libjingle_peerconnection_api",
"../api:ortc_api",
"../api:rtp_headers",
"../api:scoped_refptr",
"../api/video:video_frame",
"../call:call_interfaces",
@ -277,7 +276,6 @@ if (rtc_include_tests) {
"../api:ice_transport_factory",
"../api:libjingle_peerconnection_api",
"../api:loopback_media_transport",
"../api:rtp_headers",
"../call:rtp_interfaces",
"../call:rtp_receiver",
"../logging:rtc_event_log_api",

1
test/BUILD.gn
View File

@ -713,7 +713,6 @@ rtc_source_set("test_common") {
":video_test_common",
"../:webrtc_common",
"../api:libjingle_peerconnection_api",
"../api:rtp_headers",
"../api:scoped_refptr",
"../api:simulated_network_api",
"../api:transport_api",

1
video/BUILD.gn
View File

@ -508,7 +508,6 @@ if (rtc_include_tests) {
"../api:fake_frame_encryptor",
"../api:libjingle_peerconnection_api",
"../api:mock_frame_decryptor",
"../api:rtp_headers",
"../api:scoped_refptr",
"../api:simulated_network_api",
"../api/task_queue:default_task_queue_factory",