From e4749c2bf068435b8b474218f07a4b218de5781e Mon Sep 17 00:00:00 2001 From: Jiawei Ou Date: Tue, 21 Aug 2018 16:29:36 -0700 Subject: [PATCH] The default logic for creating video bitrate allocator. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is a mirror of `VideoCodecInitializer::CreateBitrateAllocator` Bug: webrtc:9513 Change-Id: Ib2e83e9f757387a2f6f6101d5d21512f1d507a95 Reviewed-on: https://webrtc-review.googlesource.com/92320 Commit-Queue: Jiawei Ou Reviewed-by: Tommi Reviewed-by: Erik Språng Cr-Commit-Position: refs/heads/master@{#24413} --- api/video/BUILD.gn | 2 +- api/video/video_bitrate_allocator_factory.h | 2 +- pc/BUILD.gn | 17 ++++++ pc/builtin_video_bitrate_allocator_factory.cc | 56 +++++++++++++++++++ pc/builtin_video_bitrate_allocator_factory.h | 25 +++++++++ 5 files changed, 100 insertions(+), 2 deletions(-) create mode 100644 pc/builtin_video_bitrate_allocator_factory.cc create mode 100644 pc/builtin_video_bitrate_allocator_factory.h diff --git a/api/video/BUILD.gn b/api/video/BUILD.gn index d5480dd250..a0c2ae17aa 100644 --- a/api/video/BUILD.gn +++ b/api/video/BUILD.gn @@ -108,7 +108,7 @@ rtc_source_set("video_bitrate_allocator_factory") { ] deps = [ ":video_bitrate_allocator", - "../../media:rtc_media_base", + "../video_codecs:video_codecs_api", ] } diff --git a/api/video/video_bitrate_allocator_factory.h b/api/video/video_bitrate_allocator_factory.h index bb1d8b60a1..897c34f01f 100644 --- a/api/video/video_bitrate_allocator_factory.h +++ b/api/video/video_bitrate_allocator_factory.h @@ -13,7 +13,7 @@ #include #include "api/video/video_bitrate_allocator.h" -#include "media/base/codec.h" +#include "api/video_codecs/video_codec.h" namespace webrtc { diff --git a/pc/BUILD.gn b/pc/BUILD.gn index 8e41ce07aa..2453fa1c8f 100644 --- a/pc/BUILD.gn +++ b/pc/BUILD.gn @@ -214,6 +214,23 @@ rtc_static_library("peerconnection") { ] } +rtc_static_library("builtin_video_bitrate_allocator_factory") { + sources = [ + "builtin_video_bitrate_allocator_factory.cc", + "builtin_video_bitrate_allocator_factory.h", + ] + + deps = [ + "../api/video:video_bitrate_allocator_factory", + "../media:rtc_media_base", + "../modules/video_coding:video_coding_utility", + "../modules/video_coding:webrtc_vp9_helpers", + "../rtc_base:ptr_util", + "../rtc_base/system:fallthrough", + "//third_party/abseil-cpp/absl/memory", + ] +} + # This target implements CreatePeerConnectionFactory methods that will create a # PeerConnection will full functionality (audio, video and data). Applications # that wish to reduce their binary size by ommitting functionality they don't diff --git a/pc/builtin_video_bitrate_allocator_factory.cc b/pc/builtin_video_bitrate_allocator_factory.cc new file mode 100644 index 0000000000..46d7daea6f --- /dev/null +++ b/pc/builtin_video_bitrate_allocator_factory.cc @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2018 The WebRTC project authors. All Rights Reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ + +#include "pc/builtin_video_bitrate_allocator_factory.h" + +#include "absl/memory/memory.h" +#include "media/base/codec.h" +#include "modules/video_coding/codecs/vp9/svc_rate_allocator.h" +#include "modules/video_coding/utility/default_video_bitrate_allocator.h" +#include "modules/video_coding/utility/simulcast_rate_allocator.h" +#include "rtc_base/system/fallthrough.h" + +namespace webrtc { + +namespace { + +class BuiltinVideoBitrateAllocatorFactory + : public VideoBitrateAllocatorFactory { + public: + BuiltinVideoBitrateAllocatorFactory() = default; + ~BuiltinVideoBitrateAllocatorFactory() override = default; + + std::unique_ptr CreateVideoBitrateAllocator( + const VideoCodec& codec) override { + std::unique_ptr rate_allocator; + switch (codec.codecType) { + case kVideoCodecVP8: + RTC_FALLTHROUGH(); + case kVideoCodecH264: + rate_allocator.reset(new SimulcastRateAllocator(codec)); + break; + case kVideoCodecVP9: + rate_allocator.reset(new SvcRateAllocator(codec)); + break; + default: + rate_allocator.reset(new DefaultVideoBitrateAllocator(codec)); + } + return rate_allocator; + } +}; + +} // namespace + +std::unique_ptr +CreateBuiltinVideoBitrateAllocatorFactory() { + return absl::make_unique(); +} + +} // namespace webrtc diff --git a/pc/builtin_video_bitrate_allocator_factory.h b/pc/builtin_video_bitrate_allocator_factory.h new file mode 100644 index 0000000000..60f2afcbab --- /dev/null +++ b/pc/builtin_video_bitrate_allocator_factory.h @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2018 The WebRTC project authors. All Rights Reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ + +#ifndef PC_BUILTIN_VIDEO_BITRATE_ALLOCATOR_FACTORY_H_ +#define PC_BUILTIN_VIDEO_BITRATE_ALLOCATOR_FACTORY_H_ + +#include + +#include "api/video/video_bitrate_allocator_factory.h" + +namespace webrtc { + +std::unique_ptr +CreateBuiltinVideoBitrateAllocatorFactory(); + +} // namespace webrtc + +#endif // PC_BUILTIN_VIDEO_BITRATE_ALLOCATOR_FACTORY_H_