From 7fd0a28bdfd495a49c3e152cbf13463d80ee1258 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Spr=C3=A5ng?= Date: Tue, 22 May 2018 15:37:23 +0200 Subject: [PATCH] Directly include VideoBitrateAllocation in media/ targets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:9271 Change-Id: I11a79c350a9de6edee203c9711ca97e266049f32 Reviewed-on: https://webrtc-review.googlesource.com/76943 Reviewed-by: Per Kjellander Commit-Queue: Erik Språng Cr-Commit-Position: refs/heads/master@{#23368} --- media/BUILD.gn | 4 ++++ media/engine/scopedvideoencoder.cc | 1 + media/engine/simulcast_encoder_adapter.cc | 1 + media/engine/videoencodersoftwarefallbackwrapper_unittest.cc | 1 + 4 files changed, 7 insertions(+) diff --git a/media/BUILD.gn b/media/BUILD.gn index 8d0a9911f8..749327f3bd 100644 --- a/media/BUILD.gn +++ b/media/BUILD.gn @@ -194,6 +194,7 @@ rtc_static_library("rtc_internal_video_codecs") { ":rtc_media_base", ":rtc_software_fallback_wrappers", "..:webrtc_common", + "../api/video:video_bitrate_allocation", "../api/video:video_frame_i420", "../api/video_codecs:video_codecs_api", "../call:call_interfaces", @@ -229,6 +230,7 @@ rtc_static_library("rtc_software_fallback_wrappers") { deps = [ ":rtc_h264_profile_id", ":rtc_media_base", + "../api/video:video_bitrate_allocation", "../api/video_codecs:video_codecs_api", "../modules/video_coding:video_codec_interface", "../rtc_base:checks", @@ -487,6 +489,7 @@ if (rtc_include_tests) { ":rtc_media_base", "..:webrtc_common", "../api:call_api", + "../api/video:video_bitrate_allocation", "../api/video:video_frame", "../api/video_codecs:video_codecs_api", "../call:call_interfaces", @@ -640,6 +643,7 @@ if (rtc_include_tests) { "../api:mock_video_codec_factory", "../api/audio_codecs:builtin_audio_decoder_factory", "../api/audio_codecs:builtin_audio_encoder_factory", + "../api/video:video_bitrate_allocation", "../api/video:video_frame", "../api/video_codecs:builtin_video_decoder_factory", "../api/video_codecs:builtin_video_encoder_factory", diff --git a/media/engine/scopedvideoencoder.cc b/media/engine/scopedvideoencoder.cc index 2a1d93d3db..026654e072 100644 --- a/media/engine/scopedvideoencoder.cc +++ b/media/engine/scopedvideoencoder.cc @@ -12,6 +12,7 @@ #include +#include "api/video/video_bitrate_allocation.h" #include "api/video_codecs/video_encoder.h" namespace cricket { diff --git a/media/engine/simulcast_encoder_adapter.cc b/media/engine/simulcast_encoder_adapter.cc index 88c0a38470..65d60756ec 100644 --- a/media/engine/simulcast_encoder_adapter.cc +++ b/media/engine/simulcast_encoder_adapter.cc @@ -14,6 +14,7 @@ #include "api/video/i420_buffer.h" +#include "api/video/video_bitrate_allocation.h" #include "api/video_codecs/video_encoder_factory.h" #include "media/engine/scopedvideoencoder.h" #include "modules/video_coding/codecs/vp8/screenshare_layers.h" diff --git a/media/engine/videoencodersoftwarefallbackwrapper_unittest.cc b/media/engine/videoencodersoftwarefallbackwrapper_unittest.cc index 07b569c681..cf0d5e0e1f 100644 --- a/media/engine/videoencodersoftwarefallbackwrapper_unittest.cc +++ b/media/engine/videoencodersoftwarefallbackwrapper_unittest.cc @@ -13,6 +13,7 @@ #include #include "api/video/i420_buffer.h" +#include "api/video/video_bitrate_allocation.h" #include "modules/video_coding/codecs/vp8/include/vp8.h" #include "modules/video_coding/codecs/vp8/simulcast_rate_allocator.h" #include "modules/video_coding/codecs/vp8/temporal_layers.h"