Complete moving i420 out from video_frame_api.
Bug: webrtc:7504
Change-Id: I2cbcc91bd6be4d55c0d78cf06c69fb8db2d35e65
Reviewed-on: https://webrtc-review.googlesource.com/22640
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Patrik Höglund <phoglund@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20913}diff --git a/api/BUILD.gn b/api/BUILD.gn
index 8a76f25..2767314 100644
--- a/api/BUILD.gn
+++ b/api/BUILD.gn
@@ -79,19 +79,20 @@
public_deps = [
":libjingle_api_deprecated_headers",
- ":mediastream_interface_and_implicit_video_frame_api",
":peerconnection_and_implicit_call_api",
]
deps = [
":optional",
":rtc_stats_api",
+ ":video_frame_api",
"audio_codecs:audio_codecs_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.
"..:webrtc_common",
+ "../modules/audio_processing:audio_processing_statistics",
"../rtc_base:rtc_base",
"../rtc_base:rtc_base_approved",
]
@@ -116,19 +117,6 @@
]
}
-rtc_source_set("mediastream_interface_and_implicit_video_frame_api") {
- # The mediastreaminterface.h file pulls in in video_frame.h, but the
- # system_wrappers dependency that comes with that breaks pnacl downstream.
- # TODO(phoglund): solve this (see bugs.webrtc.org/7504).
- check_includes = false
- sources = [
- "mediastreaminterface.h",
- ]
- deps = [
- "../modules/audio_processing:audio_processing_statistics",
- ]
-}
-
rtc_source_set("libjingle_api_deprecated_headers") {
# We need to include headers from undeclared targets here, since they cause
# circular dependencies. These deprecated headers are going away anyway.
@@ -223,10 +211,6 @@
rtc_source_set("video_frame_api") {
sources = [
- # TODO(phoglund): move i420 files to video_frame_api_i420 after updating
- # downstream. See bugs.webrtc.org/7504.
- "video/i420_buffer.cc",
- "video/i420_buffer.h",
"video/video_content_type.cc",
"video/video_content_type.h",
"video/video_frame.cc",
@@ -240,7 +224,6 @@
deps = [
"../rtc_base:rtc_base_approved",
- "../system_wrappers",
]
# TODO(nisse): This logic is duplicated in multiple places.
@@ -258,6 +241,7 @@
rtc_source_set("video_frame_api_i420") {
sources = [
+ "video/i420_buffer.cc",
"video/i420_buffer.h",
]
deps = [