Drop dependency of common_video on api:libjingle_peerconnection_api.

Deleting the apparently unused include of api/rtp_headers from
common/video/include/video_frame.h broke the PayloadRouter and
VideoSendStream code under video/. Missing declaration of the
RtpPayloadState struct declared in api/rtp_headers.h. Moving the
declaration of that struct to payload_router.h (outside of the api),
since it's used only internally in video/, and that seemed to be a
more logical place for it.

Bug: webrtc:7504
Change-Id: Ibed8233dfeea8bdf144db5422cdf897da824d6ee
Reviewed-on: https://webrtc-review.googlesource.com/53701
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22080}

api/BUILD.gn

@@ -87,7 +87,6 @@ rtc_static_library("libjingle_peerconnection_api") {
     "turncustomizer.h",
     "umametrics.cc",
     "umametrics.h",
-    "videosinkinterface.h",
     "videosourceinterface.cc",
     "videosourceinterface.h",
     "videosourceproxy.h",
@@ -229,6 +228,7 @@ rtc_source_set("video_frame_api") {
     "video/video_rotation.h",
     "video/video_timing.cc",
     "video/video_timing.h",
+    "videosinkinterface.h",
   ]
 
   deps = [

api/rtp_headers.h

@@ -168,11 +168,6 @@ struct RtpKeepAliveConfig final {
   bool operator!=(const RtpKeepAliveConfig& o) const { return !(*this == o); }
 };
 
-// Currently only VP8/VP9 specific.
-struct RtpPayloadState {
-  int16_t picture_id = -1;
-};
-
 }  // namespace webrtc
 
 #endif  // API_RTP_HEADERS_H_

common_video/BUILD.gn

@@ -57,7 +57,6 @@ rtc_static_library("common_video") {
   deps = [
     "..:webrtc_common",
     "../:typedefs",
-    "../api:libjingle_peerconnection_api",
     "../api:optional",
     "../api:video_frame_api",
     "../api:video_frame_api_i420",

common_video/include/video_frame.h

@@ -16,7 +16,9 @@
 // to refactor and clean up related interfaces, at which point it
 // should be moved to somewhere under api/.
 
-#include "api/rtp_headers.h"
+#include "api/video/video_content_type.h"
+#include "api/video/video_rotation.h"
+#include "api/video/video_timing.h"
 #include "common_types.h"  // NOLINT(build/include)
 #include "typedefs.h"  // NOLINT(build/include)
 

pc/BUILD.gn

@@ -72,6 +72,7 @@ rtc_static_library("rtc_pc_base") {
     "../api:libjingle_peerconnection_api",
     "../api:optional",
     "../api:ortc_api",
+    "../api:video_frame_api",
     "../common_video:common_video",
     "../media:rtc_data",
     "../media:rtc_h264_profile_id",
@@ -183,6 +184,7 @@ rtc_static_library("peerconnection") {
     "../api:libjingle_peerconnection_api",
     "../api:optional",
     "../api:rtc_stats_api",
+    "../api:video_frame_api",
     "../api/video_codecs:video_codecs_api",
     "../call:call_interfaces",
     "../common_video:common_video",

test/BUILD.gn

@@ -706,7 +706,7 @@ rtc_source_set("test_renderer_generic") {
     ":test_support",
     "..:webrtc_common",
     "../:typedefs",
-    "../api:libjingle_peerconnection_api",
+    "../api:video_frame_api",
     "../common_video",
     "../media:rtc_media_base",
     "../rtc_base:checks",

video/payload_router.h

@@ -26,6 +26,11 @@ class RTPFragmentationHeader;
 class RtpRtcp;
 struct RTPVideoHeader;
 
+// Currently only VP8/VP9 specific.
+struct RtpPayloadState {
+  int16_t picture_id = -1;
+};
+
 // PayloadRouter routes outgoing data to the correct sending RTP module, based
 // on the simulcast layer in RTPVideoHeader.
 class PayloadRouter : public EncodedImageCallback {

video/video_send_stream.cc

@@ -37,7 +37,6 @@
 #include "rtc_base/weak_ptr.h"
 #include "system_wrappers/include/field_trial.h"
 #include "video/call_stats.h"
-#include "video/payload_router.h"
 
 namespace webrtc {
 

video/video_send_stream.h

@@ -25,6 +25,7 @@
 #include "rtc_base/task_queue.h"
 #include "video/encoder_rtcp_feedback.h"
 #include "video/send_delay_stats.h"
+#include "video/payload_router.h"
 #include "video/send_statistics_proxy.h"
 #include "video/video_stream_encoder.h"