From 9d138fc7ce4970d5a6f8394345e4fe3153a117f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Thu, 15 Feb 2018 16:58:43 +0100 Subject: [PATCH] Drop dependency of common_video on api:libjingle_peerconnection_api. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Erik Språng Reviewed-by: Karl Wiberg Reviewed-by: Patrik Höglund Cr-Commit-Position: refs/heads/master@{#22080} --- api/BUILD.gn | 2 +- api/rtp_headers.h | 5 ----- common_video/BUILD.gn | 1 - common_video/include/video_frame.h | 4 +++- pc/BUILD.gn | 2 ++ test/BUILD.gn | 2 +- video/payload_router.h | 5 +++++ video/video_send_stream.cc | 1 - video/video_send_stream.h | 1 + 9 files changed, 13 insertions(+), 10 deletions(-) diff --git a/api/BUILD.gn b/api/BUILD.gn index c4787d5b05..144ee0371e 100644 --- a/api/BUILD.gn +++ b/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 = [ diff --git a/api/rtp_headers.h b/api/rtp_headers.h index 2624a33e5f..c5496b64ea 100644 --- a/api/rtp_headers.h +++ b/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_ diff --git a/common_video/BUILD.gn b/common_video/BUILD.gn index 7b37cd15f6..c0cc70a716 100644 --- a/common_video/BUILD.gn +++ b/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", diff --git a/common_video/include/video_frame.h b/common_video/include/video_frame.h index 572a4e4703..af363d44cc 100644 --- a/common_video/include/video_frame.h +++ b/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) diff --git a/pc/BUILD.gn b/pc/BUILD.gn index 0d0c511c58..1eb0f72dcf 100644 --- a/pc/BUILD.gn +++ b/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", diff --git a/test/BUILD.gn b/test/BUILD.gn index b688dd3b52..f021c141c3 100644 --- a/test/BUILD.gn +++ b/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", diff --git a/video/payload_router.h b/video/payload_router.h index 68779eff4d..169eda4996 100644 --- a/video/payload_router.h +++ b/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 { diff --git a/video/video_send_stream.cc b/video/video_send_stream.cc index b956b08799..f3af9958f3 100644 --- a/video/video_send_stream.cc +++ b/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 { diff --git a/video/video_send_stream.h b/video/video_send_stream.h index 9212370644..0049406eb6 100644 --- a/video/video_send_stream.h +++ b/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"