mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-18 16:17:50 +01:00
4d9df38d82
This CL changes the API for webrtc::VideoEncoder. There is a legacy method called SetRates(). This is indicated as being deprecated, but there seem to be a number of usages still left. Then there is the new SetRateAllocation() method which takes a VideoBitrateAllocation instance instead of a single target bitrate. This CL adds a new version of SetRates() which moves all the existing parameters in a RateControlParameters struct, and adds a bandwidth allocation signal. The intent of this signal is to allow the encoder to know how close to the target it needs to stay. If the encoder rate is network restricted, it will need to be more aggressive in keep the rate down and possibly drop frames. If there is some margin for overshoot, it might do different trade-offs. Furthermore, the frame rate signal is changes from an integer to a floating point type in order to get more precise rates at low frame rates and the return type has been changed to void since the only use of the previous values to log it and that is better done inside encoder where the error condition originates. The intent is to properly deprecate the "old" SetRates() / SetRateAllocation() methods, send out a PSA and then remove them in two weeks. Changes required by users should be trivial, as using the new headroom signal is optional. Bug: webrtc:10155, webrtc:10481 Change-Id: I4f797b0b0c73086111869ef4ee5f42bf530f5fde Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/129724 Commit-Queue: Erik Språng <sprang@webrtc.org> Reviewed-by: Niels Moller <nisse@webrtc.org> Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> Cr-Commit-Position: refs/heads/master@{#27314}
154 lines
4.2 KiB
Text
154 lines
4.2 KiB
Text
# Copyright (c) 2017 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.
|
|
|
|
import("../../webrtc.gni")
|
|
if (is_android) {
|
|
import("//build/config/android/config.gni")
|
|
import("//build/config/android/rules.gni")
|
|
}
|
|
|
|
rtc_source_set("video_codecs_api") {
|
|
visibility = [ "*" ]
|
|
sources = [
|
|
"sdp_video_format.cc",
|
|
"sdp_video_format.h",
|
|
"video_codec.cc",
|
|
"video_codec.h",
|
|
"video_decoder.cc",
|
|
"video_decoder.h",
|
|
"video_decoder_factory.cc",
|
|
"video_decoder_factory.h",
|
|
"video_encoder.cc",
|
|
"video_encoder.h",
|
|
"video_encoder_config.cc",
|
|
"video_encoder_config.h",
|
|
"video_encoder_factory.h",
|
|
"vp8_frame_buffer_controller.h",
|
|
"vp8_frame_config.cc",
|
|
"vp8_frame_config.h",
|
|
"vp8_temporal_layers.cc",
|
|
"vp8_temporal_layers.h",
|
|
]
|
|
|
|
deps = [
|
|
"..:scoped_refptr",
|
|
"../..:webrtc_common",
|
|
"../../modules/video_coding:codec_globals_headers",
|
|
"../../rtc_base:checks",
|
|
"../../rtc_base:rtc_base_approved",
|
|
"../../rtc_base/system:rtc_export",
|
|
"../units:data_rate",
|
|
"../video:encoded_image",
|
|
"../video:video_bitrate_allocation",
|
|
"../video:video_codec_constants",
|
|
"../video:video_frame",
|
|
"//third_party/abseil-cpp/absl/algorithm:container",
|
|
"//third_party/abseil-cpp/absl/container:inlined_vector",
|
|
"//third_party/abseil-cpp/absl/strings",
|
|
"//third_party/abseil-cpp/absl/types:optional",
|
|
]
|
|
}
|
|
|
|
rtc_source_set("bitstream_parser_api") {
|
|
visibility = [ "*" ]
|
|
sources = [
|
|
"bitstream_parser.h",
|
|
]
|
|
deps = [
|
|
"..:array_view",
|
|
]
|
|
}
|
|
|
|
rtc_static_library("builtin_video_decoder_factory") {
|
|
visibility = [ "*" ]
|
|
allow_poison = [
|
|
"audio_codecs", # TODO(bugs.webrtc.org/8396): Remove.
|
|
"software_video_codecs",
|
|
]
|
|
sources = [
|
|
"builtin_video_decoder_factory.cc",
|
|
"builtin_video_decoder_factory.h",
|
|
]
|
|
|
|
deps = [
|
|
":video_codecs_api",
|
|
"../../api:scoped_refptr",
|
|
"../../media:rtc_internal_video_codecs",
|
|
"../../rtc_base/system:rtc_export",
|
|
"//third_party/abseil-cpp/absl/memory",
|
|
]
|
|
}
|
|
|
|
rtc_static_library("builtin_video_encoder_factory") {
|
|
visibility = [ "*" ]
|
|
allow_poison = [
|
|
"audio_codecs", # TODO(bugs.webrtc.org/8396): Remove.
|
|
"software_video_codecs",
|
|
]
|
|
sources = [
|
|
"builtin_video_encoder_factory.cc",
|
|
"builtin_video_encoder_factory.h",
|
|
]
|
|
|
|
deps = [
|
|
":video_codecs_api",
|
|
"../../api:scoped_refptr",
|
|
"../../media:rtc_encoder_simulcast_proxy",
|
|
"../../media:rtc_internal_video_codecs",
|
|
"../../media:rtc_media_base",
|
|
"../../rtc_base:checks",
|
|
"../../rtc_base/system:rtc_export",
|
|
"//third_party/abseil-cpp/absl/memory",
|
|
"//third_party/abseil-cpp/absl/strings",
|
|
]
|
|
}
|
|
|
|
rtc_static_library("vp8_temporal_layers_factory") {
|
|
visibility = [ "*" ]
|
|
allow_poison = [ "software_video_codecs" ]
|
|
sources = [
|
|
"vp8_temporal_layers_factory.cc",
|
|
"vp8_temporal_layers_factory.h",
|
|
]
|
|
|
|
deps = [
|
|
":video_codecs_api",
|
|
"../../modules/video_coding:video_coding_utility",
|
|
"../../modules/video_coding:webrtc_vp8_temporal_layers",
|
|
"../../rtc_base:checks",
|
|
"//third_party/abseil-cpp/absl/memory",
|
|
]
|
|
}
|
|
|
|
rtc_static_library("rtc_software_fallback_wrappers") {
|
|
visibility = [ "*" ]
|
|
|
|
sources = [
|
|
"video_decoder_software_fallback_wrapper.cc",
|
|
"video_decoder_software_fallback_wrapper.h",
|
|
"video_encoder_software_fallback_wrapper.cc",
|
|
"video_encoder_software_fallback_wrapper.h",
|
|
]
|
|
|
|
deps = [
|
|
":video_codecs_api",
|
|
"../../:webrtc_common",
|
|
"../../media:rtc_h264_profile_id",
|
|
"../../media:rtc_media_base",
|
|
"../../modules/video_coding:video_codec_interface",
|
|
"../../rtc_base:checks",
|
|
"../../rtc_base:rtc_base_approved",
|
|
"../../rtc_base/system:fallthrough",
|
|
"../../system_wrappers:field_trial",
|
|
"../video:encoded_image",
|
|
"../video:video_bitrate_allocation",
|
|
"../video:video_frame",
|
|
"//third_party/abseil-cpp/absl/memory",
|
|
"//third_party/abseil-cpp/absl/types:optional",
|
|
]
|
|
}
|