Merge remote tracking branch 'upstream-master'

Bug: 153469641
Test: run cuttlefish locally
Change-Id: Ida3bfe62ef5c6549278f4c155a1f690b008e9b9d
This commit is contained in:
Jorge E. Moreira
2020-07-23 13:07:40 -07:00
1236 changed files with 50564 additions and 32463 deletions

View File

@ -17,8 +17,8 @@ rtc_library("alr_experiment") {
"../:rtc_base_approved",
"../../api/transport:field_trial_based_config",
"../../api/transport:webrtc_key_value_config",
"//third_party/abseil-cpp/absl/types:optional",
]
absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
}
rtc_library("field_trial_parser") {
@ -40,6 +40,8 @@ rtc_library("field_trial_parser") {
"../../rtc_base:logging",
"../../rtc_base:safe_conversions",
"../../rtc_base:stringutils",
]
absl_deps = [
"//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/strings:strings",
"//third_party/abseil-cpp/absl/types:optional",
@ -57,8 +59,8 @@ rtc_library("quality_rampup_experiment") {
"../../api/transport:field_trial_based_config",
"../../api/transport:webrtc_key_value_config",
"../../system_wrappers:field_trial",
"//third_party/abseil-cpp/absl/types:optional",
]
absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
}
rtc_library("quality_scaler_settings") {
@ -72,8 +74,8 @@ rtc_library("quality_scaler_settings") {
"../../api/transport:field_trial_based_config",
"../../api/transport:webrtc_key_value_config",
"../../system_wrappers:field_trial",
"//third_party/abseil-cpp/absl/types:optional",
]
absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
}
rtc_library("quality_scaling_experiment") {
@ -85,8 +87,8 @@ rtc_library("quality_scaling_experiment") {
"../:rtc_base_approved",
"../../api/video_codecs:video_codecs_api",
"../../system_wrappers:field_trial",
"//third_party/abseil-cpp/absl/types:optional",
]
absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
}
rtc_library("normalize_simulcast_size_experiment") {
@ -97,8 +99,8 @@ rtc_library("normalize_simulcast_size_experiment") {
deps = [
"../:rtc_base_approved",
"../../system_wrappers:field_trial",
"//third_party/abseil-cpp/absl/types:optional",
]
absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
}
rtc_library("balanced_degradation_settings") {
@ -111,8 +113,8 @@ rtc_library("balanced_degradation_settings") {
"../:rtc_base_approved",
"../../api/video_codecs:video_codecs_api",
"../../system_wrappers:field_trial",
"//third_party/abseil-cpp/absl/types:optional",
]
absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
}
rtc_library("cpu_speed_experiment") {
@ -123,8 +125,8 @@ rtc_library("cpu_speed_experiment") {
deps = [
"../:rtc_base_approved",
"../../system_wrappers:field_trial",
"//third_party/abseil-cpp/absl/types:optional",
]
absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
}
rtc_library("rtt_mult_experiment") {
@ -135,8 +137,8 @@ rtc_library("rtt_mult_experiment") {
deps = [
"../:rtc_base_approved",
"../../system_wrappers:field_trial",
"//third_party/abseil-cpp/absl/types:optional",
]
absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
}
rtc_library("jitter_upper_bound_experiment") {
@ -147,8 +149,8 @@ rtc_library("jitter_upper_bound_experiment") {
deps = [
"../:rtc_base_approved",
"../../system_wrappers:field_trial",
"//third_party/abseil-cpp/absl/types:optional",
]
absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
}
rtc_library("rate_control_settings") {
@ -164,6 +166,8 @@ rtc_library("rate_control_settings") {
"../../api/units:data_size",
"../../api/video_codecs:video_codecs_api",
"../../system_wrappers:field_trial",
]
absl_deps = [
"//third_party/abseil-cpp/absl/strings",
"//third_party/abseil-cpp/absl/types:optional",
]
@ -178,8 +182,8 @@ rtc_library("keyframe_interval_settings_experiment") {
":field_trial_parser",
"../../api/transport:field_trial_based_config",
"../../api/transport:webrtc_key_value_config",
"//third_party/abseil-cpp/absl/types:optional",
]
absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
}
rtc_library("stable_target_rate_experiment") {
@ -192,8 +196,8 @@ rtc_library("stable_target_rate_experiment") {
":rate_control_settings",
"../../api/transport:field_trial_based_config",
"../../api/transport:webrtc_key_value_config",
"//third_party/abseil-cpp/absl/types:optional",
]
absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
}
rtc_library("min_video_bitrate_experiment") {
@ -208,8 +212,8 @@ rtc_library("min_video_bitrate_experiment") {
"../../rtc_base:checks",
"../../rtc_base:logging",
"../../system_wrappers:field_trial",
"//third_party/abseil-cpp/absl/types:optional",
]
absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
}
if (rtc_include_tests) {
@ -255,7 +259,7 @@ if (rtc_include_tests) {
"../../test:field_trial",
"../../test:test_main",
"../../test:test_support",
"//third_party/abseil-cpp/absl/types:optional",
]
absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
}
}

View File

@ -70,4 +70,8 @@ bool QualityRampupExperiment::BwHigh(int64_t now_ms,
return (now_ms - *start_ms_) >= min_duration_ms_.Value();
}
bool QualityRampupExperiment::Enabled() const {
return min_pixels_ || min_duration_ms_ || max_bitrate_kbps_;
}
} // namespace webrtc

View File

@ -33,6 +33,8 @@ class QualityRampupExperiment final {
// (max_bitrate_factor_) above |max_bitrate_kbps_| for |min_duration_ms_|.
bool BwHigh(int64_t now_ms, uint32_t available_bw_kbps);
bool Enabled() const;
private:
explicit QualityRampupExperiment(
const WebRtcKeyValueConfig* const key_value_config);