Prepare for splitting the api/video:video_frames build rule.

This change is part of a change to break the dependency between "api:rtp_headers" and "api/video:video_frame". It does so by first creating an empty "api/video:video_rtp_headers" build rule so that downstream projects can be fixed before moving the source files.

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

BUILD.gn

@@ -427,7 +427,10 @@ if (!build_with_chromium) {
     }
 
     if (build_with_mozilla) {
-      deps += [ "api/video:video_frame" ]
+      deps += [
+        "api/video:video_frame",
+        "api/video:video_rtp_headers",
+      ]
     } else {
       deps += [
         "api",

api/BUILD.gn

@@ -74,6 +74,7 @@ rtc_source_set("rtp_headers") {
     ":array_view",
     "..:webrtc_common",
     "video:video_frame",
+    "video:video_rtp_headers",
     "//third_party/abseil-cpp/absl/types:optional",
   ]
 }
@@ -180,6 +181,7 @@ rtc_static_library("libjingle_peerconnection_api") {
     "units:timestamp",
     "video:encoded_image",
     "video:video_frame",
+    "video:video_rtp_headers",
     "//third_party/abseil-cpp/absl/algorithm:container",
     "//third_party/abseil-cpp/absl/strings",
     "//third_party/abseil-cpp/absl/types:optional",
@@ -236,6 +238,7 @@ rtc_source_set("video_quality_analyzer_api") {
     ":stats_observer_interface",
     "video:encoded_image",
     "video:video_frame",
+    "video:video_rtp_headers",
     "video_codecs:video_codecs_api",
     "//third_party/abseil-cpp/absl/types:optional",
   ]

api/video/BUILD.gn

@@ -8,6 +8,32 @@
 
 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",
+  ]
+
+  deps = [
+    "..:array_view",
+    "../../rtc_base:rtc_base_approved",
+    "//third_party/abseil-cpp/absl/types:optional",
+  ]
+}
+
 rtc_source_set("video_frame") {
   visibility = [ "*" ]
   sources = [
@@ -32,6 +58,7 @@ rtc_source_set("video_frame") {
   ]
 
   deps = [
+    ":video_rtp_headers",
     "..:array_view",
     "..:scoped_refptr",
     "../../rtc_base:checks",
@@ -56,6 +83,7 @@ rtc_source_set("video_frame_i420") {
   ]
   deps = [
     ":video_frame",
+    ":video_rtp_headers",
     "..:scoped_refptr",
     "../../rtc_base",
     "../../rtc_base:checks",
@@ -74,6 +102,7 @@ rtc_source_set("video_frame_i010") {
   deps = [
     ":video_frame",
     ":video_frame_i420",
+    ":video_rtp_headers",
     "..:scoped_refptr",
     "../../rtc_base",
     "../../rtc_base:checks",
@@ -91,6 +120,8 @@ rtc_source_set("encoded_image") {
     ":video_codec_constants",
     ":video_frame",
     ":video_frame_type",
+    ":video_rtp_headers",
+    "..:rtp_packet_info",
     "../..:webrtc_common",
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base_approved",

api/video/test/BUILD.gn

@@ -17,6 +17,7 @@ rtc_source_set("rtc_api_video_unittests") {
   deps = [
     "..:video_bitrate_allocation",
     "..:video_frame",
+    "..:video_rtp_headers",
     "../../../test:test_support",
     "//third_party/abseil-cpp/absl/types:optional",
   ]

api/video_codecs/BUILD.gn

@@ -47,6 +47,7 @@ rtc_source_set("video_codecs_api") {
     "../video:video_bitrate_allocation",
     "../video:video_codec_constants",
     "../video:video_frame",
+    "../video:video_rtp_headers",
     "//third_party/abseil-cpp/absl/algorithm:container",
     "//third_party/abseil-cpp/absl/container:inlined_vector",
     "//third_party/abseil-cpp/absl/strings",
@@ -148,6 +149,7 @@ rtc_static_library("rtc_software_fallback_wrappers") {
     "../video:encoded_image",
     "../video:video_bitrate_allocation",
     "../video:video_frame",
+    "../video:video_rtp_headers",
     "//third_party/abseil-cpp/absl/memory",
     "//third_party/abseil-cpp/absl/types:optional",
   ]

api/video_codecs/test/BUILD.gn

@@ -35,6 +35,7 @@ if (rtc_include_tests) {
       "../../video:video_bitrate_allocation",
       "../../video:video_frame",
       "../../video:video_frame_i420",
+      "../../video:video_rtp_headers",
       "//testing/gtest",
       "//third_party/abseil-cpp/absl/memory",
     ]

call/BUILD.gn

@@ -136,6 +136,7 @@ rtc_source_set("rtp_sender") {
     "../api/units:time_delta",
     "../api/units:timestamp",
     "../api/video:video_frame",
+    "../api/video:video_rtp_headers",
     "../api/video_codecs:video_codecs_api",
     "../logging:rtc_event_bwe",
     "../logging:rtc_event_log_api",
@@ -276,6 +277,7 @@ rtc_source_set("video_stream_api") {
     "../api:rtp_headers",
     "../api:transport_api",
     "../api/video:video_frame",
+    "../api/video:video_rtp_headers",
     "../api/video:video_stream_encoder",
     "../api/video_codecs:video_codecs_api",
     "../common_video",
@@ -374,6 +376,7 @@ if (rtc_include_tests) {
       "../api/audio_codecs:builtin_audio_decoder_factory",
       "../api/task_queue:default_task_queue_factory",
       "../api/video:video_frame",
+      "../api/video:video_rtp_headers",
       "../audio",
       "../logging:rtc_event_log_api",
       "../logging:rtc_event_log_impl_base",

common_video/BUILD.gn

@@ -47,6 +47,7 @@ rtc_static_library("common_video") {
     "../api/video:video_bitrate_allocator",
     "../api/video:video_frame",
     "../api/video:video_frame_i420",
+    "../api/video:video_rtp_headers",
     "../api/video_codecs:bitstream_parser_api",
     "../media:rtc_h264_profile_id",
     "../rtc_base",
@@ -95,6 +96,7 @@ if (rtc_include_tests) {
       "../api/video:video_frame",
       "../api/video:video_frame_i010",
       "../api/video:video_frame_i420",
+      "../api/video:video_rtp_headers",
       "../media:rtc_h264_profile_id",
       "../rtc_base",
       "../rtc_base:checks",

common_video/test/BUILD.gn

@@ -16,7 +16,9 @@ if (rtc_include_tests) {
       "utilities.h",
     ]
     deps = [
+      "../../api:rtp_packet_info",
       "../../api/video:video_frame",
+      "../../api/video:video_rtp_headers",
     ]
   }
 }

examples/BUILD.gn

@@ -646,6 +646,7 @@ if (is_linux || is_win) {
       "../api/audio:audio_mixer_api",
       "../api/audio_codecs:audio_codecs_api",
       "../api/video:video_frame_i420",
+      "../api/video:video_rtp_headers",
       "../api/video_codecs:video_codecs_api",
       "../media:rtc_media_base",
       "../p2p:rtc_p2p",
@@ -688,6 +689,7 @@ if (is_linux || is_win) {
       "../api/audio_codecs:builtin_audio_decoder_factory",
       "../api/audio_codecs:builtin_audio_encoder_factory",
       "../api/video:video_frame",
+      "../api/video:video_rtp_headers",
       "../api/video_codecs:builtin_video_decoder_factory",
       "../api/video_codecs:builtin_video_encoder_factory",
       "../media:rtc_audio_video",
@@ -795,6 +797,7 @@ if (is_win || is_android) {
       "../api/audio_codecs:builtin_audio_decoder_factory",
       "../api/audio_codecs:builtin_audio_encoder_factory",
       "../api/video:video_frame",
+      "../api/video:video_rtp_headers",
       "../media:rtc_audio_video",
       "../media:rtc_internal_video_codecs",
       "../media:rtc_media",

media/BUILD.gn

@@ -81,6 +81,7 @@ rtc_static_library("rtc_media_base") {
     "../api/video:video_bitrate_allocator_factory",
     "../api/video:video_frame",
     "../api/video:video_frame_i420",
+    "../api/video:video_rtp_headers",
     "../api/video_codecs:video_codecs_api",
     "../call:call_interfaces",
     "../common_video",
@@ -161,6 +162,7 @@ rtc_static_library("rtc_simulcast_encoder_adapter") {
     "../api/video:video_codec_constants",
     "../api/video:video_frame",
     "../api/video:video_frame_i420",
+    "../api/video:video_rtp_headers",
     "../api/video_codecs:video_codecs_api",
     "../modules/video_coding:video_codec_interface",
     "../modules/video_coding:video_coding_utility",
@@ -188,6 +190,7 @@ rtc_static_library("rtc_encoder_simulcast_proxy") {
     ":rtc_simulcast_encoder_adapter",
     "../api/video:video_bitrate_allocation",
     "../api/video:video_frame",
+    "../api/video:video_rtp_headers",
     "../api/video_codecs:video_codecs_api",
     "../modules/video_coding:video_codec_interface",
     "../rtc_base/system:rtc_export",
@@ -209,7 +212,7 @@ rtc_static_library("rtc_internal_video_codecs") {
     "../api/video:encoded_image",
     "../api/video:video_bitrate_allocation",
     "../api/video:video_frame",
-    "../api/video:video_frame",
+    "../api/video:video_rtp_headers",
     "../api/video_codecs:rtc_software_fallback_wrappers",
     "../api/video_codecs:video_codecs_api",
     "../call:call_interfaces",
@@ -266,6 +269,7 @@ rtc_static_library("rtc_audio_video") {
     "../api/video:video_codec_constants",
     "../api/video:video_frame",
     "../api/video:video_frame_i420",
+    "../api/video:video_rtp_headers",
     "../api/video_codecs:rtc_software_fallback_wrappers",
     "../api/video_codecs:video_codecs_api",
     "../call",
@@ -422,6 +426,7 @@ if (rtc_include_tests) {
       "../api/video:video_bitrate_allocation",
       "../api/video:video_frame",
       "../api/video:video_frame_i420",
+      "../api/video:video_rtp_headers",
       "../api/video_codecs:video_codecs_api",
       "../call:call_interfaces",
       "../call:mock_rtp_interfaces",
@@ -521,6 +526,7 @@ if (rtc_include_tests) {
       "../api/video:video_bitrate_allocation",
       "../api/video:video_frame",
       "../api/video:video_frame_i420",
+      "../api/video:video_rtp_headers",
       "../api/video_codecs:builtin_video_decoder_factory",
       "../api/video_codecs:builtin_video_encoder_factory",
       "../api/video_codecs:video_codecs_api",

modules/rtp_rtcp/BUILD.gn

@@ -98,6 +98,7 @@ rtc_source_set("rtp_rtcp_format") {
     "../../api/audio_codecs:audio_codecs_api",
     "../../api/transport:network_control",
     "../../api/video:video_frame",
+    "../../api/video:video_rtp_headers",
     "../../common_video",
     "../../rtc_base:checks",
     "../../rtc_base:deprecation",
@@ -215,6 +216,7 @@ rtc_static_library("rtp_rtcp") {
     "../../api/video:video_bitrate_allocation",
     "../../api/video:video_bitrate_allocator",
     "../../api/video:video_frame",
+    "../../api/video:video_rtp_headers",
     "../../api/video_codecs:video_codecs_api",
     "../../call:rtp_interfaces",
     "../../common_video",
@@ -287,6 +289,7 @@ rtc_source_set("rtp_video_header") {
     "../../:webrtc_common",
     "../../api/video:video_frame",
     "../../api/video:video_frame_type",
+    "../../api/video:video_rtp_headers",
     "../../modules/video_coding:codec_globals_headers",
     "//third_party/abseil-cpp/absl/container:inlined_vector",
     "//third_party/abseil-cpp/absl/types:optional",
@@ -453,6 +456,7 @@ if (rtc_include_tests) {
       "../../api/video:video_bitrate_allocator",
       "../../api/video:video_codec_constants",
       "../../api/video:video_frame",
+      "../../api/video:video_rtp_headers",
       "../../api/video_codecs:video_codecs_api",
       "../../call:rtp_receiver",
       "../../common_video",

modules/video_capture/BUILD.gn

@@ -31,6 +31,7 @@ rtc_static_library("video_capture_module") {
     "../../api:scoped_refptr",
     "../../api/video:video_frame",
     "../../api/video:video_frame_i420",
+    "../../api/video:video_rtp_headers",
     "../../common_video",
     "../../media:rtc_media_base",
     "../../rtc_base:rtc_base_approved",
@@ -126,6 +127,7 @@ if (!build_with_chromium) {
         "../../api:scoped_refptr",
         "../../api/video:video_frame",
         "../../api/video:video_frame_i420",
+        "../../api/video:video_rtp_headers",
         "../../common_video",
         "../../rtc_base:rtc_base_approved",
         "../../system_wrappers",

modules/video_coding/BUILD.gn

@@ -20,6 +20,7 @@ rtc_static_library("encoded_frame") {
     "../../api/video:encoded_image",
     "../../api/video:video_frame",
     "../../api/video:video_frame_i420",
+    "../../api/video:video_rtp_headers",
     "../../modules:module_api",
     "../../modules:module_api_public",
     "../../rtc_base:checks",
@@ -63,6 +64,7 @@ rtc_static_library("packet") {
     "..:module_api",
     "../../:webrtc_common",
     "../../api:rtp_headers",
+    "../../api:rtp_packet_info",
     "../../api/video:video_frame_type",
     "../rtp_rtcp:rtp_rtcp_format",
     "../rtp_rtcp:rtp_video_header",
@@ -158,6 +160,7 @@ rtc_static_library("video_coding") {
     "../../api/video:video_bitrate_allocator",
     "../../api/video:video_frame",
     "../../api/video:video_frame_i420",
+    "../../api/video:video_rtp_headers",
     "../../api/video_codecs:video_codecs_api",
     "../../common_video",
     "../../rtc_base",
@@ -196,6 +199,7 @@ rtc_source_set("video_codec_interface") {
   deps = [
     "..:module_api",
     "../../api/video:video_frame",
+    "../../api/video:video_rtp_headers",
     "../../api/video_codecs:video_codecs_api",
     "../../common_video",
     "../../common_video/generic_frame_descriptor",
@@ -290,6 +294,7 @@ rtc_static_library("webrtc_h264") {
     "../../api/video:video_frame",
     "../../api/video:video_frame_i010",
     "../../api/video:video_frame_i420",
+    "../../api/video:video_rtp_headers",
     "../../api/video_codecs:video_codecs_api",
     "../../common_video",
     "../../media:rtc_h264_profile_id",
@@ -336,6 +341,7 @@ rtc_static_library("webrtc_multiplex") {
     "../../api/video:encoded_image",
     "../../api/video:video_frame",
     "../../api/video:video_frame_i420",
+    "../../api/video:video_rtp_headers",
     "../../api/video_codecs:video_codecs_api",
     "../../common_video",
     "../../rtc_base",
@@ -369,6 +375,7 @@ rtc_static_library("webrtc_vp8") {
     "../../api/video:encoded_image",
     "../../api/video:video_frame",
     "../../api/video:video_frame_i420",
+    "../../api/video:video_rtp_headers",
     "../../api/video_codecs:video_codecs_api",
     "../../api/video_codecs:vp8_temporal_layers_factory",
     "../../common_video",
@@ -460,6 +467,7 @@ rtc_static_library("webrtc_vp9") {
     "../../api:scoped_refptr",
     "../../api/video:video_frame",
     "../../api/video:video_frame_i010",
+    "../../api/video:video_rtp_headers",
     "../../api/video_codecs:video_codecs_api",
     "../../common_video",
     "../../media:rtc_media_base",
@@ -505,6 +513,7 @@ if (rtc_include_tests) {
 
       deps = [
         "../../api/video:video_frame",
+        "../../api/video:video_rtp_headers",
         "../../api/video_codecs:video_codecs_api",
         "../../media:rtc_audio_video",
         "../../media:rtc_media_base",
@@ -537,6 +546,7 @@ if (rtc_include_tests) {
       "../../api/video:encoded_image",
       "../../api/video:video_frame",
       "../../api/video:video_frame_i420",
+      "../../api/video:video_rtp_headers",
       "../../api/video_codecs:video_codecs_api",
       "../../common_video",
       "../../rtc_base:checks",
@@ -573,6 +583,7 @@ if (rtc_include_tests) {
       "../../api/video:video_bitrate_allocator_factory",
       "../../api/video:video_frame",
       "../../api/video:video_frame_i420",
+      "../../api/video:video_rtp_headers",
       "../../api/video_codecs:video_codecs_api",
       "../../common_video",
       "../../rtc_base:checks",
@@ -719,6 +730,7 @@ if (rtc_include_tests) {
       "../../api/video:encoded_image",
       "../../api/video:video_frame",
       "../../api/video:video_frame_i420",
+      "../../api/video:video_rtp_headers",
       "../../api/video_codecs:rtc_software_fallback_wrappers",
       "../../api/video_codecs:video_codecs_api",
       "../../common_video",
@@ -845,6 +857,7 @@ if (rtc_include_tests) {
       "../../api/video:video_bitrate_allocator_factory",
       "../../api/video:video_frame",
       "../../api/video:video_frame_i420",
+      "../../api/video:video_rtp_headers",
       "../../api/video_codecs:video_codecs_api",
       "../../api/video_codecs:vp8_temporal_layers_factory",
       "../../common_video",

modules/video_processing/BUILD.gn

@@ -30,6 +30,7 @@ rtc_static_library("video_processing") {
     "../../api:scoped_refptr",
     "../../api/video:video_frame",
     "../../api/video:video_frame_i420",
+    "../../api/video:video_rtp_headers",
     "../../common_audio",
     "../../common_video",
     "../../modules/utility",
@@ -108,6 +109,7 @@ if (rtc_include_tests) {
       "../../api:scoped_refptr",
       "../../api/video:video_frame",
       "../../api/video:video_frame_i420",
+      "../../api/video:video_rtp_headers",
       "../../common_video",
       "../../test:fileutils",
       "../../test:test_support",

pc/BUILD.gn

@@ -83,6 +83,7 @@ rtc_static_library("rtc_pc_base") {
     "../api:scoped_refptr",
     "../api/video:builtin_video_bitrate_allocator_factory",
     "../api/video:video_frame",
+    "../api/video:video_rtp_headers",
     "../call:call_interfaces",
     "../call:rtp_interfaces",
     "../call:rtp_receiver",
@@ -214,6 +215,7 @@ rtc_static_library("peerconnection") {
     "../api/task_queue",
     "../api/video:builtin_video_bitrate_allocator_factory",
     "../api/video:video_frame",
+    "../api/video:video_rtp_headers",
     "../api/video_codecs:video_codecs_api",
     "../call:call_interfaces",
     "../common_video",
@@ -427,6 +429,7 @@ if (rtc_include_tests) {
       "../api/task_queue:default_task_queue_factory",
       "../api/video:builtin_video_bitrate_allocator_factory",
       "../api/video:video_frame",
+      "../api/video:video_rtp_headers",
       "../api/video_codecs:builtin_video_decoder_factory",
       "../api/video_codecs:builtin_video_encoder_factory",
       "../api/video_codecs:video_codecs_api",

rtc_tools/BUILD.gn

@@ -69,6 +69,7 @@ rtc_static_library("video_file_reader") {
     "../api:scoped_refptr",
     "../api/video:video_frame",
     "../api/video:video_frame_i420",
+    "../api/video:video_rtp_headers",
     "../rtc_base:checks",
     "../rtc_base:rtc_base_approved",
     "//third_party/abseil-cpp/absl/strings",
@@ -86,6 +87,7 @@ rtc_static_library("video_file_writer") {
     "../api:scoped_refptr",
     "../api/video:video_frame",
     "../api/video:video_frame_i420",
+    "../api/video:video_rtp_headers",
     "../rtc_base:rtc_base_approved",
     "//third_party/abseil-cpp/absl/strings",
     "//third_party/abseil-cpp/absl/types:optional",
@@ -111,6 +113,7 @@ rtc_static_library("video_quality_analysis") {
     "../api:scoped_refptr",
     "../api/video:video_frame",
     "../api/video:video_frame_i420",
+    "../api/video:video_rtp_headers",
     "../common_video",
     "../rtc_base:checks",
     "../rtc_base:rtc_base_approved",
@@ -205,6 +208,7 @@ if (!build_with_chromium) {
       ":video_quality_analysis",
       "../api:scoped_refptr",
       "../api/video:video_frame",
+      "../api/video:video_rtp_headers",
     ]
   }
 
@@ -219,6 +223,7 @@ if (!build_with_chromium) {
       ":video_quality_analysis",
       "../api:scoped_refptr",
       "../api/video:video_frame",
+      "../api/video:video_rtp_headers",
     ]
   }
 
@@ -417,6 +422,7 @@ if (rtc_include_tests) {
       "../api:scoped_refptr",
       "../api/video:video_frame",
       "../api/video:video_frame_i420",
+      "../api/video:video_rtp_headers",
       "../common_video",
       "../rtc_base",
       "../rtc_base:checks",

sdk/BUILD.gn

@@ -332,6 +332,7 @@ if (is_ios || is_mac) {
         "../api:libjingle_peerconnection_api",
         "../api/video:video_frame",
         "../api/video:video_frame_i420",
+        "../api/video:video_rtp_headers",
         "../common_video",
         "../media:rtc_media_base",
         "../rtc_base",
@@ -360,6 +361,7 @@ if (is_ios || is_mac) {
         ":base_objc",
         "//api/video:video_frame",
         "//api/video:video_frame_i420",
+        "//api/video:video_rtp_headers",
         "//common_video",
         "//rtc_base:checks",
         "//rtc_base:rtc_base_approved",
@@ -413,6 +415,7 @@ if (is_ios || is_mac) {
         ":videosource_objc",
         "../api:libjingle_peerconnection_api",
         "../api/video:video_frame",
+        "../api/video:video_rtp_headers",
         "../common_video",
         "../media:rtc_media_base",
         "../rtc_base",
@@ -491,6 +494,7 @@ if (is_ios || is_mac) {
           ":video_objc",
           ":videoframebuffer_objc",
           "../api/video:video_frame",
+          "../api/video:video_rtp_headers",
           "../rtc_base:checks",
           "../rtc_base:rtc_base_approved",
         ]
@@ -915,6 +919,7 @@ if (is_ios || is_mac) {
         "../api/audio_codecs:builtin_audio_encoder_factory",
         "../api/task_queue:default_task_queue_factory",
         "../api/video:video_frame",
+        "../api/video:video_rtp_headers",
         "../api/video_codecs:video_codecs_api",
         "../common_video",
         "../logging:rtc_event_log_impl_base",
@@ -1551,6 +1556,7 @@ if (is_ios || is_mac) {
         "../api:libjingle_peerconnection_api",
         "../api:scoped_refptr",
         "../api/video:video_frame",
+        "../api/video:video_rtp_headers",
         "../api/video_codecs:video_codecs_api",
         "../common_video",
         "../rtc_base",
@@ -1588,6 +1594,7 @@ if (is_ios || is_mac) {
         ":wrapped_native_codec_objc",
         "../api/video:video_frame",
         "../api/video:video_frame_i420",
+        "../api/video:video_rtp_headers",
         "../api/video_codecs:video_codecs_api",
         "../common_video",
         "../media:rtc_audio_video",

sdk/android/BUILD.gn

@@ -698,6 +698,7 @@ if (is_android) {
       "../../api/video:encoded_image",
       "../../api/video:video_frame",
       "../../api/video:video_frame_type",
+      "../../api/video:video_rtp_headers",
       "../../api/video_codecs:rtc_software_fallback_wrappers",
       "../../api/video_codecs:video_codecs_api",
       "../../common_video",
@@ -1007,6 +1008,7 @@ if (is_android) {
       ":videoframe_jni",
       "//api:libjingle_peerconnection_api",
       "//api/video:video_frame",
+      "//api/video:video_rtp_headers",
       "//rtc_base",
       "//rtc_base:rtc_base_approved",
       "//third_party/abseil-cpp/absl/memory",
@@ -1104,6 +1106,7 @@ if (is_android) {
       ":native_api_jni",
       "../../api:scoped_refptr",
       "../../api/video:video_frame",
+      "../../api/video:video_rtp_headers",
       "../../common_video",
       "../../rtc_base",
       "../../rtc_base:checks",
@@ -1553,6 +1556,7 @@ if (is_android) {
       "../../api:scoped_refptr",
       "../../api/task_queue:default_task_queue_factory",
       "../../api/video:video_frame",
+      "../../api/video:video_rtp_headers",
       "../../logging:rtc_event_log_impl_base",
       "../../media:rtc_audio_video",
       "../../media:rtc_internal_video_codecs",

test/BUILD.gn

@@ -58,6 +58,7 @@ rtc_source_set("video_test_common") {
     "../api/video:video_frame",
     "../api/video:video_frame_i010",
     "../api/video:video_frame_i420",
+    "../api/video:video_rtp_headers",
     "../api/video_codecs:video_codecs_api",
     "../call:video_stream_api",
     "../common_video",
@@ -300,6 +301,7 @@ if (rtc_include_tests) {
       "../api:scoped_refptr",
       "../api/video:video_frame",
       "../api/video:video_frame_i420",
+      "../api/video:video_rtp_headers",
       "../common_video",
       "../rtc_base:checks",
       "../rtc_base:rtc_base_approved",
@@ -376,6 +378,7 @@ if (rtc_include_tests) {
       "../api/video:builtin_video_bitrate_allocator_factory",
       "../api/video:video_frame",
       "../api/video:video_frame_i420",
+      "../api/video:video_rtp_headers",
       "../call:video_stream_api",
       "../modules/rtp_rtcp",
       "../modules/video_coding:simulcast_test_fixture_impl",
@@ -636,6 +639,7 @@ rtc_source_set("fake_video_codecs") {
     "../api/video:video_bitrate_allocation",
     "../api/video:video_frame",
     "../api/video:video_frame_i420",
+    "../api/video:video_rtp_headers",
     "../api/video_codecs:video_codecs_api",
     "../api/video_codecs:vp8_temporal_layers_factory",
     "../common_video",
@@ -733,6 +737,7 @@ rtc_source_set("test_common") {
     "../api/video:builtin_video_bitrate_allocator_factory",
     "../api/video:video_bitrate_allocator_factory",
     "../api/video:video_frame",
+    "../api/video:video_rtp_headers",
     "../api/video_codecs:video_codecs_api",
     "../audio",
     "../call",
@@ -823,6 +828,7 @@ rtc_source_set("test_renderer_generic") {
     ":test_support",
     "../api:scoped_refptr",
     "../api/video:video_frame",
+    "../api/video:video_rtp_headers",
     "../common_video",
     "../media:rtc_media_base",
     "../rtc_base:checks",

test/pc/e2e/BUILD.gn

@@ -131,6 +131,7 @@ rtc_source_set("quality_analyzing_video_decoder") {
     "../../../api/video:encoded_image",
     "../../../api/video:video_frame",
     "../../../api/video:video_frame_i420",
+    "../../../api/video:video_rtp_headers",
     "../../../api/video_codecs:video_codecs_api",
     "../../../modules/video_coding:video_codec_interface",
     "../../../rtc_base:criticalsection",
@@ -153,6 +154,7 @@ rtc_source_set("quality_analyzing_video_encoder") {
     "../../../api:video_quality_analyzer_api",
     "../../../api/video:encoded_image",
     "../../../api/video:video_frame",
+    "../../../api/video:video_rtp_headers",
     "../../../api/video_codecs:video_codecs_api",
     "../../../modules/video_coding:video_codec_interface",
     "../../../rtc_base:criticalsection",
@@ -177,6 +179,7 @@ if (rtc_include_tests) {
       "../../../api:stats_observer_interface",
       "../../../api:video_quality_analyzer_api",
       "../../../api/video:video_frame",
+      "../../../api/video:video_rtp_headers",
       "../../../api/video_codecs:video_codecs_api",
       "../../../test:video_test_common",
       "../../../test:video_test_support",
@@ -411,6 +414,7 @@ rtc_source_set("example_video_quality_analyzer") {
     "../../../api:video_quality_analyzer_api",
     "../../../api/video:encoded_image",
     "../../../api/video:video_frame",
+    "../../../api/video:video_rtp_headers",
     "../../../rtc_base:criticalsection",
     "../../../rtc_base:logging",
   ]
@@ -432,6 +436,7 @@ rtc_source_set("default_video_quality_analyzer") {
     "../../../api/units:timestamp",
     "../../../api/video:encoded_image",
     "../../../api/video:video_frame",
+    "../../../api/video:video_rtp_headers",
     "../../../common_video",
     "../../../rtc_base:criticalsection",
     "../../../rtc_base:logging",

test/scenario/BUILD.gn

@@ -98,6 +98,7 @@ if (rtc_include_tests) {
       "../../api/video:builtin_video_bitrate_allocator_factory",
       "../../api/video:video_frame",
       "../../api/video:video_frame_i420",
+      "../../api/video:video_rtp_headers",
       "../../api/video_codecs:video_codecs_api",
       "../../audio",
       "../../call",

video/BUILD.gn

@@ -63,6 +63,7 @@ rtc_static_library("video") {
     "../api/video:video_bitrate_allocator",
     "../api/video:video_frame",
     "../api/video:video_frame_i420",
+    "../api/video:video_rtp_headers",
     "../api/video:video_stream_encoder",
     "../api/video:video_stream_encoder_create",
     "../api/video_codecs:video_codecs_api",
@@ -133,6 +134,7 @@ rtc_source_set("video_stream_decoder_impl") {
     "../api/task_queue",
     "../api/video:encoded_frame",
     "../api/video:video_frame",
+    "../api/video:video_rtp_headers",
     "../api/video:video_stream_decoder",
     "../api/video_codecs:video_codecs_api",
     "../modules/video_coding",
@@ -189,6 +191,7 @@ rtc_source_set("video_stream_encoder_impl") {
     "../api/video:video_bitrate_allocator_factory",
     "../api/video:video_frame",
     "../api/video:video_frame_i420",
+    "../api/video:video_rtp_headers",
     "../api/video:video_stream_encoder",
     "../api/video_codecs:video_codecs_api",
     "../common_video",
@@ -258,6 +261,7 @@ if (rtc_include_tests) {
       "../api/video:builtin_video_bitrate_allocator_factory",
       "../api/video:video_bitrate_allocator_factory",
       "../api/video:video_frame",
+      "../api/video:video_rtp_headers",
       "../call:fake_network",
       "../call:simulated_network",
       "../common_video",
@@ -558,6 +562,7 @@ if (rtc_include_tests) {
       "../api/video:video_frame",
       "../api/video:video_frame_i420",
       "../api/video:video_frame_type",
+      "../api/video:video_rtp_headers",
       "../api/video_codecs:video_codecs_api",
       "../api/video_codecs:vp8_temporal_layers_factory",
       "../call:call_interfaces",