Split out a separate target for VP8EncoderSimulcastProxy

This will allow downstream projects to use it to construct their own
injected codecs without pulling in dependencies on software codecs that
they don't need.

TBR=shampson@webrtc.org

Bug: webrtc:7925
Change-Id: Ie5c246bbf8e2ef1b27562887f717af9e719a1edf
Reviewed-on: https://webrtc-review.googlesource.com/c/107698
Commit-Queue: Jonathan Yu <yujo@chromium.org>
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Anders Carlsson <andersc@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25379}
This commit is contained in:
Jonathan Yu 2018-10-24 17:21:36 -07:00 committed by Commit Bot
parent 5abd54166a
commit 327b7535f9
5 changed files with 26 additions and 3 deletions

View File

@ -79,6 +79,7 @@ rtc_static_library("builtin_video_encoder_factory") {
":video_codecs_api",
"../../media:rtc_internal_video_codecs",
"../../media:rtc_media_base",
"../../media:rtc_vp8_encoder_simulcast_proxy",
"../../rtc_base:ptr_util",
"../../rtc_base/system:rtc_export",
"//third_party/abseil-cpp/absl/memory",

View File

@ -190,6 +190,24 @@ rtc_static_library("rtc_simulcast_encoder_adapter") {
}
}
rtc_static_library("rtc_vp8_encoder_simulcast_proxy") {
visibility = [ "*" ]
defines = []
libs = []
sources = [
"engine/vp8_encoder_simulcast_proxy.cc",
"engine/vp8_encoder_simulcast_proxy.h",
]
deps = [
":rtc_simulcast_encoder_adapter",
"../api/video_codecs:video_codecs_api",
]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
}
rtc_static_library("rtc_internal_video_codecs") {
visibility = [ "*" ]
allow_poison = [ "software_video_codecs" ]
@ -198,6 +216,7 @@ rtc_static_library("rtc_internal_video_codecs") {
deps = [
":rtc_h264_profile_id",
":rtc_simulcast_encoder_adapter",
":rtc_vp8_encoder_simulcast_proxy",
"../modules/video_coding:video_codec_interface",
"//third_party/abseil-cpp/absl/memory",
]
@ -214,7 +233,9 @@ rtc_static_library("rtc_internal_video_codecs") {
"engine/scopedvideodecoder.h",
"engine/scopedvideoencoder.cc",
"engine/scopedvideoencoder.h",
"engine/vp8_encoder_simulcast_proxy.cc",
# TODO(bugs.webrtc.org/7925): stop exporting this header once downstream
# targets depend on :rtc_vp8_encoder_simulcast_proxy directly.
"engine/vp8_encoder_simulcast_proxy.h",
"engine/webrtcvideodecoderfactory.h",
"engine/webrtcvideoencoderfactory.h",
@ -599,6 +620,7 @@ if (rtc_include_tests) {
":rtc_media_base",
":rtc_media_tests_utils",
":rtc_simulcast_encoder_adapter",
":rtc_vp8_encoder_simulcast_proxy",
":rtc_vp9_profile",
"../api:create_simulcast_test_fixture_api",
"../api:libjingle_peerconnection_api",

View File

@ -11,7 +11,6 @@
#include "media/engine/vp8_encoder_simulcast_proxy.h"
#include "media/engine/simulcast_encoder_adapter.h"
#include "rtc_base/checks.h"
namespace webrtc {
VP8EncoderSimulcastProxy::VP8EncoderSimulcastProxy(VideoEncoderFactory* factory,

View File

@ -16,8 +16,8 @@
#include <vector>
#include "api/video_codecs/sdp_video_format.h"
#include "api/video_codecs/video_encoder.h"
#include "api/video_codecs/video_encoder_factory.h"
#include "modules/video_coding/codecs/vp8/include/vp8.h"
namespace webrtc {

View File

@ -213,6 +213,7 @@ if (rtc_include_tests) {
"../logging:rtc_event_log_impl_output",
"../media:rtc_audio_video",
"../media:rtc_internal_video_codecs",
"../media:rtc_vp8_encoder_simulcast_proxy",
"../modules/audio_device:audio_device_api",
"../modules/audio_device:audio_device_module_from_input_and_output",
"../modules/audio_device:windows_core_audio_utility",