From c8caaec92b744ad249d5f7d7ebea7d1a509e6ebb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Spr=C3=A5ng?= Date: Wed, 23 May 2018 15:20:31 +0200 Subject: [PATCH] Directly include VideoBitrateAllocation in common_video/ targets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:9271 Change-Id: Id31459c4ccdee1b5a65499423af5c575d5317231 Reviewed-on: https://webrtc-review.googlesource.com/76942 Reviewed-by: Stefan Holmer Commit-Queue: Erik Språng Cr-Commit-Position: refs/heads/master@{#23373} --- common_video/BUILD.gn | 1 + common_video/include/video_bitrate_allocator.h | 2 +- modules/video_coding/codecs/vp8/simulcast_rate_allocator.h | 1 + modules/video_coding/codecs/vp9/svc_rate_allocator.h | 1 + modules/video_coding/utility/default_video_bitrate_allocator.h | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/common_video/BUILD.gn b/common_video/BUILD.gn index 0e3f2da471..44e2170bca 100644 --- a/common_video/BUILD.gn +++ b/common_video/BUILD.gn @@ -58,6 +58,7 @@ rtc_static_library("common_video") { "..:webrtc_common", "../:typedefs", "../api:optional", + "../api/video:video_bitrate_allocation", "../api/video:video_frame", "../api/video:video_frame_i420", "../media:rtc_h264_profile_id", diff --git a/common_video/include/video_bitrate_allocator.h b/common_video/include/video_bitrate_allocator.h index be7cd649d0..b8a75e88aa 100644 --- a/common_video/include/video_bitrate_allocator.h +++ b/common_video/include/video_bitrate_allocator.h @@ -11,7 +11,7 @@ #ifndef COMMON_VIDEO_INCLUDE_VIDEO_BITRATE_ALLOCATOR_H_ #define COMMON_VIDEO_INCLUDE_VIDEO_BITRATE_ALLOCATOR_H_ -#include "common_types.h" // NOLINT(build/include) +#include "api/video/video_bitrate_allocation.h" namespace webrtc { diff --git a/modules/video_coding/codecs/vp8/simulcast_rate_allocator.h b/modules/video_coding/codecs/vp8/simulcast_rate_allocator.h index 7cb1a8a1fd..de5c389a7c 100644 --- a/modules/video_coding/codecs/vp8/simulcast_rate_allocator.h +++ b/modules/video_coding/codecs/vp8/simulcast_rate_allocator.h @@ -18,6 +18,7 @@ #include #include "api/video_codecs/video_encoder.h" +#include "common_types.h" // NOLINT(build/include) #include "common_video/include/video_bitrate_allocator.h" #include "modules/video_coding/codecs/vp8/temporal_layers.h" #include "rtc_base/constructormagic.h" diff --git a/modules/video_coding/codecs/vp9/svc_rate_allocator.h b/modules/video_coding/codecs/vp9/svc_rate_allocator.h index 268f18d37a..4592c18543 100644 --- a/modules/video_coding/codecs/vp9/svc_rate_allocator.h +++ b/modules/video_coding/codecs/vp9/svc_rate_allocator.h @@ -15,6 +15,7 @@ #include +#include "common_types.h" // NOLINT(build/include) #include "common_video/include/video_bitrate_allocator.h" namespace webrtc { diff --git a/modules/video_coding/utility/default_video_bitrate_allocator.h b/modules/video_coding/utility/default_video_bitrate_allocator.h index 6ecd8781e2..3eddf6f2d2 100644 --- a/modules/video_coding/utility/default_video_bitrate_allocator.h +++ b/modules/video_coding/utility/default_video_bitrate_allocator.h @@ -11,6 +11,7 @@ #ifndef MODULES_VIDEO_CODING_UTILITY_DEFAULT_VIDEO_BITRATE_ALLOCATOR_H_ #define MODULES_VIDEO_CODING_UTILITY_DEFAULT_VIDEO_BITRATE_ALLOCATOR_H_ +#include "common_types.h" // NOLINT(build/include) #include "common_video/include/video_bitrate_allocator.h" namespace webrtc {