From 4a2d57ac432d24606cd685f435ff050d43ab54da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Fri, 15 Feb 2019 09:33:37 +0100 Subject: [PATCH] Don't include video_bitrate_allocation.h from encoded_image.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The needed constant kMaxSpatialLayers is now moved to video_codec_constants.h. Bug: webrtc:8311 Change-Id: Iefde2e0668ce6a8d262d2747ad497ae8891873f9 Reviewed-on: https://webrtc-review.googlesource.com/c/123181 Reviewed-by: Erik Språng Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#26739} --- api/video/BUILD.gn | 4 +--- api/video/encoded_image.h | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/api/video/BUILD.gn b/api/video/BUILD.gn index d5905f5757..7fd0790075 100644 --- a/api/video/BUILD.gn +++ b/api/video/BUILD.gn @@ -81,11 +81,9 @@ rtc_source_set("encoded_image") { "encoded_image.h", ] deps = [ + ":video_codec_constants", ":video_frame", "../..:webrtc_common", - - # TODO(bugs.webrtc.org/8311) Cleanup when kMaxSpatialLayers is moved to proper include. - "../../api/video:video_bitrate_allocation", "../../rtc_base:checks", "../../rtc_base:rtc_base_approved", "../../rtc_base/system:rtc_export", diff --git a/api/video/encoded_image.h b/api/video/encoded_image.h index 363d34cfec..1c91400c89 100644 --- a/api/video/encoded_image.h +++ b/api/video/encoded_image.h @@ -16,7 +16,7 @@ #include "absl/types/optional.h" #include "api/video/color_space.h" -#include "api/video/video_bitrate_allocation.h" +#include "api/video/video_codec_constants.h" #include "api/video/video_codec_type.h" #include "api/video/video_content_type.h" #include "api/video/video_rotation.h"