commit c16289fb601836b8da7af47a05f785000b79e726
author Chen Xing <chxg@google.com> Mon Jun 17 09:10:00 2019
committer Commit Bot <commit-bot@chromium.org> Wed Jun 19 09:20:10 2019
tree 32e90bb35a83a1d8aba1dc4db8a3022c9e9ccf46
parent b64ad0e72c5fcf01004ac36b0b9d8f83cf736e8f

Split the build rule for video_frame into a video_rtp_headers part.

This change is breaks the dependency between "api:rtp_headers" and "api/video:video_frame".

Bug: webrtc:10668
Change-Id: Ib827de2c0e33809ab1d58338037563aa2fa249bc
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/140949
Commit-Queue: Chen Xing <chxg@google.com>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28322}

api/BUILD.gn

diff --git a/api/BUILD.gn b/api/BUILD.gn
index 906ae63..8829cc5 100644
--- a/api/BUILD.gn
+++ b/api/BUILD.gn
@@ -74,7 +74,6 @@
     ":array_view",
     "..:webrtc_common",
     "units:timestamp",
-    "video:video_frame",
     "video:video_rtp_headers",
     "//third_party/abseil-cpp/absl/types:optional",
   ]

api/video/BUILD.gn

diff --git a/api/video/BUILD.gn b/api/video/BUILD.gn
index 757acce..c6e5899 100644
--- a/api/video/BUILD.gn
+++ b/api/video/BUILD.gn
@@ -8,23 +8,19 @@
 
 import("../../webrtc.gni")
 
-# Part of a change to break the dependency between "api:rtp_headers" and
-# "api/video:video_frame". This build rule is currently just an empty
-# placeholder to help us fix downstream projects before moving the source files
-# from "api/video:video_frame".
 rtc_source_set("video_rtp_headers") {
   visibility = [ "*" ]
   sources = [
-    # "color_space.cc",
-    # "color_space.h",
-    # "hdr_metadata.cc",
-    # "hdr_metadata.h",
-    # "video_content_type.cc",
-    # "video_content_type.h",
-    # "video_frame_marking.h",
-    # "video_rotation.h",
-    # "video_timing.cc",
-    # "video_timing.h",
+    "color_space.cc",
+    "color_space.h",
+    "hdr_metadata.cc",
+    "hdr_metadata.h",
+    "video_content_type.cc",
+    "video_content_type.h",
+    "video_frame_marking.h",
+    "video_rotation.h",
+    "video_timing.cc",
+    "video_timing.h",
   ]
 
   deps = [
@@ -37,29 +33,20 @@
 rtc_source_set("video_frame") {
   visibility = [ "*" ]
   sources = [
-    "color_space.cc",
-    "color_space.h",
-    "hdr_metadata.cc",
-    "hdr_metadata.h",
     "video_codec_type.h",
-    "video_content_type.cc",
-    "video_content_type.h",
     "video_frame.cc",
     "video_frame.h",
     "video_frame_buffer.cc",
     "video_frame_buffer.h",
-    "video_frame_marking.h",
-    "video_rotation.h",
     "video_sink_interface.h",
     "video_source_interface.cc",
     "video_source_interface.h",
-    "video_timing.cc",
-    "video_timing.h",
   ]
 
   deps = [
     ":video_rtp_headers",
     "..:array_view",
+    "..:rtp_packet_info",
     "..:scoped_refptr",
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base_approved",