mflodman@webrtc.org | e6168f5 | 2013-06-26 11:23:01 +0000 | [diff] [blame] | 1 | /* |
| 2 | * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. |
| 3 | * |
| 4 | * Use of this source code is governed by a BSD-style license |
| 5 | * that can be found in the LICENSE file in the root of the source |
| 6 | * tree. An additional intellectual property rights grant can be found |
| 7 | * in the file PATENTS. All contributing project authors may |
| 8 | * be found in the AUTHORS file in the root of the source tree. |
| 9 | */ |
| 10 | |
Peter Boström | 7623ce4 | 2015-12-09 12:13:30 +0100 | [diff] [blame] | 11 | #include "webrtc/video/overuse_frame_detector.h" |
mflodman@webrtc.org | e6168f5 | 2013-06-26 11:23:01 +0000 | [diff] [blame] | 12 | |
mflodman@webrtc.org | d4412fe | 2013-07-31 16:42:21 +0000 | [diff] [blame] | 13 | #include <assert.h> |
pbos@webrtc.org | a957570 | 2013-08-30 17:16:32 +0000 | [diff] [blame] | 14 | #include <math.h> |
mflodman@webrtc.org | d4412fe | 2013-07-31 16:42:21 +0000 | [diff] [blame] | 15 | |
asapersson@webrtc.org | 9e5b034 | 2013-12-04 13:47:44 +0000 | [diff] [blame] | 16 | #include <algorithm> |
| 17 | #include <list> |
asapersson@webrtc.org | 734a532 | 2014-06-10 06:35:22 +0000 | [diff] [blame] | 18 | #include <map> |
sprang | c5d62e2 | 2017-04-02 23:53:04 -0700 | [diff] [blame^] | 19 | #include <string> |
| 20 | #include <utility> |
asapersson@webrtc.org | 9e5b034 | 2013-12-04 13:47:44 +0000 | [diff] [blame] | 21 | |
nisse | af91689 | 2017-01-10 07:44:26 -0800 | [diff] [blame] | 22 | #include "webrtc/api/video/video_frame.h" |
tommi@webrtc.org | 7a57f8f | 2015-02-08 18:27:46 +0000 | [diff] [blame] | 23 | #include "webrtc/base/checks.h" |
Peter Boström | 415d2cd | 2015-10-26 11:35:17 +0100 | [diff] [blame] | 24 | #include "webrtc/base/logging.h" |
terelius | bc5d921 | 2017-01-13 09:14:33 -0800 | [diff] [blame] | 25 | #include "webrtc/base/numerics/exp_filter.h" |
pbos | a96b60b | 2016-04-18 21:12:48 -0700 | [diff] [blame] | 26 | #include "webrtc/common_video/include/frame_callback.h" |
sprang | c5d62e2 | 2017-04-02 23:53:04 -0700 | [diff] [blame^] | 27 | #include "webrtc/system_wrappers/include/field_trial.h" |
mflodman@webrtc.org | e6168f5 | 2013-06-26 11:23:01 +0000 | [diff] [blame] | 28 | |
pbos | a102507 | 2016-05-14 03:04:19 -0700 | [diff] [blame] | 29 | #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) |
torbjorng | 448468d | 2016-02-10 08:11:57 -0800 | [diff] [blame] | 30 | #include <mach/mach.h> |
pbos | a102507 | 2016-05-14 03:04:19 -0700 | [diff] [blame] | 31 | #endif // defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) |
torbjorng | 448468d | 2016-02-10 08:11:57 -0800 | [diff] [blame] | 32 | |
mflodman@webrtc.org | e6168f5 | 2013-06-26 11:23:01 +0000 | [diff] [blame] | 33 | namespace webrtc { |
| 34 | |
mflodman@webrtc.org | d4412fe | 2013-07-31 16:42:21 +0000 | [diff] [blame] | 35 | namespace { |
perkj | d52063f | 2016-09-07 06:32:18 -0700 | [diff] [blame] | 36 | const int64_t kCheckForOveruseIntervalMs = 5000; |
| 37 | const int64_t kTimeToFirstCheckForOveruseMs = 100; |
mflodman@webrtc.org | d4412fe | 2013-07-31 16:42:21 +0000 | [diff] [blame] | 38 | |
pbos@webrtc.org | a957570 | 2013-08-30 17:16:32 +0000 | [diff] [blame] | 39 | // Delay between consecutive rampups. (Used for quick recovery.) |
| 40 | const int kQuickRampUpDelayMs = 10 * 1000; |
| 41 | // Delay between rampup attempts. Initially uses standard, scales up to max. |
asapersson@webrtc.org | 23a4d85 | 2014-08-13 14:33:49 +0000 | [diff] [blame] | 42 | const int kStandardRampUpDelayMs = 40 * 1000; |
asapersson@webrtc.org | 2881ab1 | 2014-06-12 08:46:46 +0000 | [diff] [blame] | 43 | const int kMaxRampUpDelayMs = 240 * 1000; |
pbos@webrtc.org | a957570 | 2013-08-30 17:16:32 +0000 | [diff] [blame] | 44 | // Expontential back-off factor, to prevent annoying up-down behaviour. |
| 45 | const double kRampUpBackoffFactor = 2.0; |
mflodman@webrtc.org | d4412fe | 2013-07-31 16:42:21 +0000 | [diff] [blame] | 46 | |
asapersson@webrtc.org | d980307 | 2014-06-16 14:27:19 +0000 | [diff] [blame] | 47 | // Max number of overuses detected before always applying the rampup delay. |
asapersson@webrtc.org | 23a4d85 | 2014-08-13 14:33:49 +0000 | [diff] [blame] | 48 | const int kMaxOverusesBeforeApplyRampupDelay = 4; |
asapersson@webrtc.org | 9e5b034 | 2013-12-04 13:47:44 +0000 | [diff] [blame] | 49 | |
| 50 | // The maximum exponent to use in VCMExpFilter. |
| 51 | const float kSampleDiffMs = 33.0f; |
| 52 | const float kMaxExp = 7.0f; |
| 53 | |
sprang | b1ca073 | 2017-02-01 08:38:12 -0800 | [diff] [blame] | 54 | const auto kScaleReasonCpu = AdaptationObserverInterface::AdaptReason::kCpu; |
mflodman@webrtc.org | d4412fe | 2013-07-31 16:42:21 +0000 | [diff] [blame] | 55 | } // namespace |
| 56 | |
torbjorng | 448468d | 2016-02-10 08:11:57 -0800 | [diff] [blame] | 57 | CpuOveruseOptions::CpuOveruseOptions() |
| 58 | : high_encode_usage_threshold_percent(85), |
| 59 | frame_timeout_interval_ms(1500), |
| 60 | min_frame_samples(120), |
| 61 | min_process_count(3), |
| 62 | high_threshold_consecutive_count(2) { |
pbos | a102507 | 2016-05-14 03:04:19 -0700 | [diff] [blame] | 63 | #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) |
torbjorng | 448468d | 2016-02-10 08:11:57 -0800 | [diff] [blame] | 64 | // This is proof-of-concept code for letting the physical core count affect |
| 65 | // the interval into which we attempt to scale. For now, the code is Mac OS |
| 66 | // specific, since that's the platform were we saw most problems. |
| 67 | // TODO(torbjorng): Enhance SystemInfo to return this metric. |
| 68 | |
| 69 | mach_port_t mach_host = mach_host_self(); |
| 70 | host_basic_info hbi = {}; |
| 71 | mach_msg_type_number_t info_count = HOST_BASIC_INFO_COUNT; |
| 72 | kern_return_t kr = |
| 73 | host_info(mach_host, HOST_BASIC_INFO, reinterpret_cast<host_info_t>(&hbi), |
| 74 | &info_count); |
| 75 | mach_port_deallocate(mach_task_self(), mach_host); |
| 76 | |
| 77 | int n_physical_cores; |
| 78 | if (kr != KERN_SUCCESS) { |
| 79 | // If we couldn't get # of physical CPUs, don't panic. Assume we have 1. |
| 80 | n_physical_cores = 1; |
| 81 | LOG(LS_ERROR) << "Failed to determine number of physical cores, assuming 1"; |
| 82 | } else { |
| 83 | n_physical_cores = hbi.physical_cpu; |
| 84 | LOG(LS_INFO) << "Number of physical cores:" << n_physical_cores; |
| 85 | } |
| 86 | |
| 87 | // Change init list default for few core systems. The assumption here is that |
| 88 | // encoding, which we measure here, takes about 1/4 of the processing of a |
| 89 | // two-way call. This is roughly true for x86 using both vp8 and vp9 without |
| 90 | // hardware encoding. Since we don't affect the incoming stream here, we only |
| 91 | // control about 1/2 of the total processing needs, but this is not taken into |
| 92 | // account. |
| 93 | if (n_physical_cores == 1) |
| 94 | high_encode_usage_threshold_percent = 20; // Roughly 1/4 of 100%. |
| 95 | else if (n_physical_cores == 2) |
| 96 | high_encode_usage_threshold_percent = 40; // Roughly 1/4 of 200%. |
pbos | a102507 | 2016-05-14 03:04:19 -0700 | [diff] [blame] | 97 | #endif // defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) |
torbjorng | 448468d | 2016-02-10 08:11:57 -0800 | [diff] [blame] | 98 | |
torbjorng | 448468d | 2016-02-10 08:11:57 -0800 | [diff] [blame] | 99 | // Note that we make the interval 2x+epsilon wide, since libyuv scaling steps |
| 100 | // are close to that (when squared). This wide interval makes sure that |
| 101 | // scaling up or down does not jump all the way across the interval. |
| 102 | low_encode_usage_threshold_percent = |
| 103 | (high_encode_usage_threshold_percent - 1) / 2; |
| 104 | } |
| 105 | |
asapersson@webrtc.org | 9aed002 | 2014-10-16 06:57:12 +0000 | [diff] [blame] | 106 | // Class for calculating the processing usage on the send-side (the average |
| 107 | // processing time of a frame divided by the average time difference between |
| 108 | // captured frames). |
| 109 | class OveruseFrameDetector::SendProcessingUsage { |
asapersson@webrtc.org | 9e5b034 | 2013-12-04 13:47:44 +0000 | [diff] [blame] | 110 | public: |
Peter Boström | 4b91bd0 | 2015-06-26 06:58:16 +0200 | [diff] [blame] | 111 | explicit SendProcessingUsage(const CpuOveruseOptions& options) |
asapersson@webrtc.org | 9e5b034 | 2013-12-04 13:47:44 +0000 | [diff] [blame] | 112 | : kWeightFactorFrameDiff(0.998f), |
asapersson@webrtc.org | 9aed002 | 2014-10-16 06:57:12 +0000 | [diff] [blame] | 113 | kWeightFactorProcessing(0.995f), |
asapersson@webrtc.org | e41dbee | 2014-05-13 13:45:13 +0000 | [diff] [blame] | 114 | kInitialSampleDiffMs(40.0f), |
| 115 | kMaxSampleDiffMs(45.0f), |
asapersson@webrtc.org | ce12f1f | 2014-03-24 21:59:16 +0000 | [diff] [blame] | 116 | count_(0), |
Peter Boström | 4b91bd0 | 2015-06-26 06:58:16 +0200 | [diff] [blame] | 117 | options_(options), |
asapersson@webrtc.org | 9aed002 | 2014-10-16 06:57:12 +0000 | [diff] [blame] | 118 | filtered_processing_ms_(new rtc::ExpFilter(kWeightFactorProcessing)), |
minyue@webrtc.org | 74aaf29 | 2014-07-16 21:28:26 +0000 | [diff] [blame] | 119 | filtered_frame_diff_ms_(new rtc::ExpFilter(kWeightFactorFrameDiff)) { |
asapersson@webrtc.org | ce12f1f | 2014-03-24 21:59:16 +0000 | [diff] [blame] | 120 | Reset(); |
asapersson@webrtc.org | 9e5b034 | 2013-12-04 13:47:44 +0000 | [diff] [blame] | 121 | } |
sprang | c5d62e2 | 2017-04-02 23:53:04 -0700 | [diff] [blame^] | 122 | virtual ~SendProcessingUsage() {} |
asapersson@webrtc.org | 9e5b034 | 2013-12-04 13:47:44 +0000 | [diff] [blame] | 123 | |
asapersson@webrtc.org | ce12f1f | 2014-03-24 21:59:16 +0000 | [diff] [blame] | 124 | void Reset() { |
| 125 | count_ = 0; |
| 126 | filtered_frame_diff_ms_->Reset(kWeightFactorFrameDiff); |
| 127 | filtered_frame_diff_ms_->Apply(1.0f, kInitialSampleDiffMs); |
asapersson@webrtc.org | 9aed002 | 2014-10-16 06:57:12 +0000 | [diff] [blame] | 128 | filtered_processing_ms_->Reset(kWeightFactorProcessing); |
| 129 | filtered_processing_ms_->Apply(1.0f, InitialProcessingMs()); |
asapersson@webrtc.org | ce12f1f | 2014-03-24 21:59:16 +0000 | [diff] [blame] | 130 | } |
| 131 | |
asapersson@webrtc.org | 9aed002 | 2014-10-16 06:57:12 +0000 | [diff] [blame] | 132 | void AddCaptureSample(float sample_ms) { |
asapersson@webrtc.org | 9e5b034 | 2013-12-04 13:47:44 +0000 | [diff] [blame] | 133 | float exp = sample_ms / kSampleDiffMs; |
| 134 | exp = std::min(exp, kMaxExp); |
| 135 | filtered_frame_diff_ms_->Apply(exp, sample_ms); |
| 136 | } |
| 137 | |
asapersson@webrtc.org | 9aed002 | 2014-10-16 06:57:12 +0000 | [diff] [blame] | 138 | void AddSample(float processing_ms, int64_t diff_last_sample_ms) { |
asapersson@webrtc.org | ce12f1f | 2014-03-24 21:59:16 +0000 | [diff] [blame] | 139 | ++count_; |
asapersson@webrtc.org | 9e5b034 | 2013-12-04 13:47:44 +0000 | [diff] [blame] | 140 | float exp = diff_last_sample_ms / kSampleDiffMs; |
| 141 | exp = std::min(exp, kMaxExp); |
asapersson@webrtc.org | 9aed002 | 2014-10-16 06:57:12 +0000 | [diff] [blame] | 142 | filtered_processing_ms_->Apply(exp, processing_ms); |
asapersson@webrtc.org | 9e5b034 | 2013-12-04 13:47:44 +0000 | [diff] [blame] | 143 | } |
| 144 | |
sprang | c5d62e2 | 2017-04-02 23:53:04 -0700 | [diff] [blame^] | 145 | virtual int Value() { |
asapersson@webrtc.org | ce12f1f | 2014-03-24 21:59:16 +0000 | [diff] [blame] | 146 | if (count_ < static_cast<uint32_t>(options_.min_frame_samples)) { |
| 147 | return static_cast<int>(InitialUsageInPercent() + 0.5f); |
| 148 | } |
minyue@webrtc.org | 74aaf29 | 2014-07-16 21:28:26 +0000 | [diff] [blame] | 149 | float frame_diff_ms = std::max(filtered_frame_diff_ms_->filtered(), 1.0f); |
asapersson@webrtc.org | ce12f1f | 2014-03-24 21:59:16 +0000 | [diff] [blame] | 150 | frame_diff_ms = std::min(frame_diff_ms, kMaxSampleDiffMs); |
asapersson@webrtc.org | 9e5b034 | 2013-12-04 13:47:44 +0000 | [diff] [blame] | 151 | float encode_usage_percent = |
asapersson@webrtc.org | 9aed002 | 2014-10-16 06:57:12 +0000 | [diff] [blame] | 152 | 100.0f * filtered_processing_ms_->filtered() / frame_diff_ms; |
asapersson@webrtc.org | 9e5b034 | 2013-12-04 13:47:44 +0000 | [diff] [blame] | 153 | return static_cast<int>(encode_usage_percent + 0.5); |
| 154 | } |
| 155 | |
asapersson@webrtc.org | 2881ab1 | 2014-06-12 08:46:46 +0000 | [diff] [blame] | 156 | private: |
asapersson@webrtc.org | ce12f1f | 2014-03-24 21:59:16 +0000 | [diff] [blame] | 157 | float InitialUsageInPercent() const { |
| 158 | // Start in between the underuse and overuse threshold. |
| 159 | return (options_.low_encode_usage_threshold_percent + |
| 160 | options_.high_encode_usage_threshold_percent) / 2.0f; |
| 161 | } |
| 162 | |
asapersson@webrtc.org | 9aed002 | 2014-10-16 06:57:12 +0000 | [diff] [blame] | 163 | float InitialProcessingMs() const { |
asapersson@webrtc.org | ce12f1f | 2014-03-24 21:59:16 +0000 | [diff] [blame] | 164 | return InitialUsageInPercent() * kInitialSampleDiffMs / 100; |
| 165 | } |
| 166 | |
asapersson@webrtc.org | 9e5b034 | 2013-12-04 13:47:44 +0000 | [diff] [blame] | 167 | const float kWeightFactorFrameDiff; |
asapersson@webrtc.org | 9aed002 | 2014-10-16 06:57:12 +0000 | [diff] [blame] | 168 | const float kWeightFactorProcessing; |
asapersson@webrtc.org | ce12f1f | 2014-03-24 21:59:16 +0000 | [diff] [blame] | 169 | const float kInitialSampleDiffMs; |
| 170 | const float kMaxSampleDiffMs; |
| 171 | uint64_t count_; |
Peter Boström | 4b91bd0 | 2015-06-26 06:58:16 +0200 | [diff] [blame] | 172 | const CpuOveruseOptions options_; |
kwiberg | 27f982b | 2016-03-01 11:52:33 -0800 | [diff] [blame] | 173 | std::unique_ptr<rtc::ExpFilter> filtered_processing_ms_; |
| 174 | std::unique_ptr<rtc::ExpFilter> filtered_frame_diff_ms_; |
asapersson@webrtc.org | 9e5b034 | 2013-12-04 13:47:44 +0000 | [diff] [blame] | 175 | }; |
| 176 | |
sprang | c5d62e2 | 2017-04-02 23:53:04 -0700 | [diff] [blame^] | 177 | // Class used for manual testing of overuse, enabled via field trial flag. |
| 178 | class OveruseFrameDetector::OverdoseInjector |
| 179 | : public OveruseFrameDetector::SendProcessingUsage { |
| 180 | public: |
| 181 | OverdoseInjector(const CpuOveruseOptions& options, |
| 182 | int64_t normal_period_ms, |
| 183 | int64_t overuse_period_ms, |
| 184 | int64_t underuse_period_ms) |
| 185 | : OveruseFrameDetector::SendProcessingUsage(options), |
| 186 | normal_period_ms_(normal_period_ms), |
| 187 | overuse_period_ms_(overuse_period_ms), |
| 188 | underuse_period_ms_(underuse_period_ms), |
| 189 | state_(State::kNormal), |
| 190 | last_toggling_ms_(-1) { |
| 191 | RTC_DCHECK_GT(overuse_period_ms, 0); |
| 192 | RTC_DCHECK_GT(normal_period_ms, 0); |
| 193 | LOG(LS_INFO) << "Simulating overuse with intervals " << normal_period_ms |
| 194 | << "ms normal mode, " << overuse_period_ms |
| 195 | << "ms overuse mode."; |
| 196 | } |
| 197 | |
| 198 | ~OverdoseInjector() override {} |
| 199 | |
| 200 | int Value() override { |
| 201 | int64_t now_ms = rtc::TimeMillis(); |
| 202 | if (last_toggling_ms_ == -1) { |
| 203 | last_toggling_ms_ = now_ms; |
| 204 | } else { |
| 205 | switch (state_) { |
| 206 | case State::kNormal: |
| 207 | if (now_ms > last_toggling_ms_ + normal_period_ms_) { |
| 208 | state_ = State::kOveruse; |
| 209 | last_toggling_ms_ = now_ms; |
| 210 | LOG(LS_INFO) << "Simulating CPU overuse."; |
| 211 | } |
| 212 | break; |
| 213 | case State::kOveruse: |
| 214 | if (now_ms > last_toggling_ms_ + overuse_period_ms_) { |
| 215 | state_ = State::kUnderuse; |
| 216 | last_toggling_ms_ = now_ms; |
| 217 | LOG(LS_INFO) << "Simulating CPU underuse."; |
| 218 | } |
| 219 | break; |
| 220 | case State::kUnderuse: |
| 221 | if (now_ms > last_toggling_ms_ + underuse_period_ms_) { |
| 222 | state_ = State::kNormal; |
| 223 | last_toggling_ms_ = now_ms; |
| 224 | LOG(LS_INFO) << "Actual CPU overuse measurements in effect."; |
| 225 | } |
| 226 | break; |
| 227 | } |
| 228 | } |
| 229 | |
| 230 | rtc::Optional<int> overried_usage_value; |
| 231 | switch (state_) { |
| 232 | case State::kNormal: |
| 233 | break; |
| 234 | case State::kOveruse: |
| 235 | overried_usage_value.emplace(250); |
| 236 | break; |
| 237 | case State::kUnderuse: |
| 238 | overried_usage_value.emplace(5); |
| 239 | break; |
| 240 | } |
| 241 | |
| 242 | return overried_usage_value.value_or(SendProcessingUsage::Value()); |
| 243 | } |
| 244 | |
| 245 | private: |
| 246 | const int64_t normal_period_ms_; |
| 247 | const int64_t overuse_period_ms_; |
| 248 | const int64_t underuse_period_ms_; |
| 249 | enum class State { kNormal, kOveruse, kUnderuse } state_; |
| 250 | int64_t last_toggling_ms_; |
| 251 | }; |
| 252 | |
| 253 | std::unique_ptr<OveruseFrameDetector::SendProcessingUsage> |
| 254 | OveruseFrameDetector::CreateSendProcessingUsage( |
| 255 | const CpuOveruseOptions& options) { |
| 256 | std::unique_ptr<SendProcessingUsage> instance; |
| 257 | std::string toggling_interval = |
| 258 | field_trial::FindFullName("WebRTC-ForceSimulatedOveruseIntervalMs"); |
| 259 | if (!toggling_interval.empty()) { |
| 260 | int normal_period_ms = 0; |
| 261 | int overuse_period_ms = 0; |
| 262 | int underuse_period_ms = 0; |
| 263 | if (sscanf(toggling_interval.c_str(), "%d-%d-%d", &normal_period_ms, |
| 264 | &overuse_period_ms, &underuse_period_ms) == 3) { |
| 265 | if (normal_period_ms > 0 && overuse_period_ms > 0 && |
| 266 | underuse_period_ms > 0) { |
| 267 | instance.reset(new OverdoseInjector( |
| 268 | options, normal_period_ms, overuse_period_ms, underuse_period_ms)); |
| 269 | } else { |
| 270 | LOG(LS_WARNING) |
| 271 | << "Invalid (non-positive) normal/overuse/underuse periods: " |
| 272 | << normal_period_ms << " / " << overuse_period_ms << " / " |
| 273 | << underuse_period_ms; |
| 274 | } |
| 275 | } else { |
| 276 | LOG(LS_WARNING) << "Malformed toggling interval: " << toggling_interval; |
| 277 | } |
| 278 | } |
| 279 | |
| 280 | if (!instance) { |
| 281 | // No valid overuse simulation parameters set, use normal usage class. |
| 282 | instance.reset(new SendProcessingUsage(options)); |
| 283 | } |
| 284 | |
| 285 | return instance; |
| 286 | } |
| 287 | |
perkj | d52063f | 2016-09-07 06:32:18 -0700 | [diff] [blame] | 288 | class OveruseFrameDetector::CheckOveruseTask : public rtc::QueuedTask { |
| 289 | public: |
| 290 | explicit CheckOveruseTask(OveruseFrameDetector* overuse_detector) |
| 291 | : overuse_detector_(overuse_detector) { |
| 292 | rtc::TaskQueue::Current()->PostDelayedTask( |
| 293 | std::unique_ptr<rtc::QueuedTask>(this), kTimeToFirstCheckForOveruseMs); |
| 294 | } |
| 295 | |
| 296 | void Stop() { |
| 297 | RTC_CHECK(task_checker_.CalledSequentially()); |
| 298 | overuse_detector_ = nullptr; |
| 299 | } |
| 300 | |
| 301 | private: |
| 302 | bool Run() override { |
| 303 | RTC_CHECK(task_checker_.CalledSequentially()); |
| 304 | if (!overuse_detector_) |
| 305 | return true; // This will make the task queue delete this task. |
| 306 | overuse_detector_->CheckForOveruse(); |
| 307 | |
| 308 | rtc::TaskQueue::Current()->PostDelayedTask( |
| 309 | std::unique_ptr<rtc::QueuedTask>(this), kCheckForOveruseIntervalMs); |
| 310 | // Return false to prevent this task from being deleted. Ownership has been |
| 311 | // transferred to the task queue when PostDelayedTask was called. |
| 312 | return false; |
| 313 | } |
| 314 | rtc::SequencedTaskChecker task_checker_; |
| 315 | OveruseFrameDetector* overuse_detector_; |
| 316 | }; |
| 317 | |
pbos@webrtc.org | 3e6e271 | 2015-02-26 12:19:31 +0000 | [diff] [blame] | 318 | OveruseFrameDetector::OveruseFrameDetector( |
Peter Boström | 4b91bd0 | 2015-06-26 06:58:16 +0200 | [diff] [blame] | 319 | const CpuOveruseOptions& options, |
sprang | b1ca073 | 2017-02-01 08:38:12 -0800 | [diff] [blame] | 320 | AdaptationObserverInterface* observer, |
Peter Boström | e449915 | 2016-02-05 11:13:28 +0100 | [diff] [blame] | 321 | EncodedFrameObserver* encoder_timing, |
pbos@webrtc.org | 3e6e271 | 2015-02-26 12:19:31 +0000 | [diff] [blame] | 322 | CpuOveruseMetricsObserver* metrics_observer) |
perkj | d52063f | 2016-09-07 06:32:18 -0700 | [diff] [blame] | 323 | : check_overuse_task_(nullptr), |
| 324 | options_(options), |
Peter Boström | 4b91bd0 | 2015-06-26 06:58:16 +0200 | [diff] [blame] | 325 | observer_(observer), |
Peter Boström | e449915 | 2016-02-05 11:13:28 +0100 | [diff] [blame] | 326 | encoder_timing_(encoder_timing), |
pbos@webrtc.org | 3e6e271 | 2015-02-26 12:19:31 +0000 | [diff] [blame] | 327 | metrics_observer_(metrics_observer), |
asapersson@webrtc.org | b60346e | 2014-02-17 19:02:15 +0000 | [diff] [blame] | 328 | num_process_times_(0), |
nisse | e0e3bdf | 2017-01-18 02:16:20 -0800 | [diff] [blame] | 329 | // TODO(nisse): Use rtc::Optional |
| 330 | last_capture_time_us_(-1), |
| 331 | last_processed_capture_time_us_(-1), |
asapersson | 74d85e1 | 2015-09-24 00:53:32 -0700 | [diff] [blame] | 332 | num_pixels_(0), |
Peter Boström | e449915 | 2016-02-05 11:13:28 +0100 | [diff] [blame] | 333 | last_overuse_time_ms_(-1), |
pbos@webrtc.org | a957570 | 2013-08-30 17:16:32 +0000 | [diff] [blame] | 334 | checks_above_threshold_(0), |
asapersson@webrtc.org | d980307 | 2014-06-16 14:27:19 +0000 | [diff] [blame] | 335 | num_overuse_detections_(0), |
Peter Boström | e449915 | 2016-02-05 11:13:28 +0100 | [diff] [blame] | 336 | last_rampup_time_ms_(-1), |
pbos@webrtc.org | a957570 | 2013-08-30 17:16:32 +0000 | [diff] [blame] | 337 | in_quick_rampup_(false), |
asapersson@webrtc.org | e2af622 | 2013-09-23 20:05:39 +0000 | [diff] [blame] | 338 | current_rampup_delay_ms_(kStandardRampUpDelayMs), |
sprang | c5d62e2 | 2017-04-02 23:53:04 -0700 | [diff] [blame^] | 339 | usage_(CreateSendProcessingUsage(options)) { |
perkj | d52063f | 2016-09-07 06:32:18 -0700 | [diff] [blame] | 340 | task_checker_.Detach(); |
asapersson@webrtc.org | 9e5b034 | 2013-12-04 13:47:44 +0000 | [diff] [blame] | 341 | } |
mflodman@webrtc.org | e6168f5 | 2013-06-26 11:23:01 +0000 | [diff] [blame] | 342 | |
| 343 | OveruseFrameDetector::~OveruseFrameDetector() { |
perkj | d52063f | 2016-09-07 06:32:18 -0700 | [diff] [blame] | 344 | RTC_DCHECK(!check_overuse_task_) << "StopCheckForOverUse must be called."; |
| 345 | } |
| 346 | |
| 347 | void OveruseFrameDetector::StartCheckForOveruse() { |
| 348 | RTC_DCHECK_CALLED_SEQUENTIALLY(&task_checker_); |
| 349 | RTC_DCHECK(!check_overuse_task_); |
| 350 | check_overuse_task_ = new CheckOveruseTask(this); |
| 351 | } |
| 352 | void OveruseFrameDetector::StopCheckForOveruse() { |
| 353 | RTC_DCHECK_CALLED_SEQUENTIALLY(&task_checker_); |
| 354 | check_overuse_task_->Stop(); |
| 355 | check_overuse_task_ = nullptr; |
mflodman@webrtc.org | e6168f5 | 2013-06-26 11:23:01 +0000 | [diff] [blame] | 356 | } |
| 357 | |
Peter Boström | e449915 | 2016-02-05 11:13:28 +0100 | [diff] [blame] | 358 | void OveruseFrameDetector::EncodedFrameTimeMeasured(int encode_duration_ms) { |
perkj | d52063f | 2016-09-07 06:32:18 -0700 | [diff] [blame] | 359 | RTC_DCHECK_CALLED_SEQUENTIALLY(&task_checker_); |
Peter Boström | e449915 | 2016-02-05 11:13:28 +0100 | [diff] [blame] | 360 | if (!metrics_) |
| 361 | metrics_ = rtc::Optional<CpuOveruseMetrics>(CpuOveruseMetrics()); |
| 362 | metrics_->encode_usage_percent = usage_->Value(); |
asapersson@webrtc.org | 9aed002 | 2014-10-16 06:57:12 +0000 | [diff] [blame] | 363 | |
Peter Boström | e449915 | 2016-02-05 11:13:28 +0100 | [diff] [blame] | 364 | metrics_observer_->OnEncodedFrameTimeMeasured(encode_duration_ms, *metrics_); |
asapersson@webrtc.org | ab6bf4f | 2014-05-27 07:43:15 +0000 | [diff] [blame] | 365 | } |
| 366 | |
asapersson@webrtc.org | 8a8c3ef | 2014-03-20 13:15:01 +0000 | [diff] [blame] | 367 | bool OveruseFrameDetector::FrameSizeChanged(int num_pixels) const { |
perkj | d52063f | 2016-09-07 06:32:18 -0700 | [diff] [blame] | 368 | RTC_DCHECK_CALLED_SEQUENTIALLY(&task_checker_); |
asapersson@webrtc.org | 8a8c3ef | 2014-03-20 13:15:01 +0000 | [diff] [blame] | 369 | if (num_pixels != num_pixels_) { |
| 370 | return true; |
| 371 | } |
| 372 | return false; |
| 373 | } |
| 374 | |
nisse | e0e3bdf | 2017-01-18 02:16:20 -0800 | [diff] [blame] | 375 | bool OveruseFrameDetector::FrameTimeoutDetected(int64_t now_us) const { |
perkj | d52063f | 2016-09-07 06:32:18 -0700 | [diff] [blame] | 376 | RTC_DCHECK_CALLED_SEQUENTIALLY(&task_checker_); |
nisse | e0e3bdf | 2017-01-18 02:16:20 -0800 | [diff] [blame] | 377 | if (last_capture_time_us_ == -1) |
asapersson@webrtc.org | b60346e | 2014-02-17 19:02:15 +0000 | [diff] [blame] | 378 | return false; |
nisse | e0e3bdf | 2017-01-18 02:16:20 -0800 | [diff] [blame] | 379 | return (now_us - last_capture_time_us_) > |
| 380 | options_.frame_timeout_interval_ms * rtc::kNumMicrosecsPerMillisec; |
asapersson@webrtc.org | 8a8c3ef | 2014-03-20 13:15:01 +0000 | [diff] [blame] | 381 | } |
| 382 | |
| 383 | void OveruseFrameDetector::ResetAll(int num_pixels) { |
perkj | d52063f | 2016-09-07 06:32:18 -0700 | [diff] [blame] | 384 | RTC_DCHECK_CALLED_SEQUENTIALLY(&task_checker_); |
asapersson@webrtc.org | 8a8c3ef | 2014-03-20 13:15:01 +0000 | [diff] [blame] | 385 | num_pixels_ = num_pixels; |
asapersson@webrtc.org | 9aed002 | 2014-10-16 06:57:12 +0000 | [diff] [blame] | 386 | usage_->Reset(); |
Peter Boström | e449915 | 2016-02-05 11:13:28 +0100 | [diff] [blame] | 387 | frame_timing_.clear(); |
nisse | e0e3bdf | 2017-01-18 02:16:20 -0800 | [diff] [blame] | 388 | last_capture_time_us_ = -1; |
| 389 | last_processed_capture_time_us_ = -1; |
asapersson@webrtc.org | 8a8c3ef | 2014-03-20 13:15:01 +0000 | [diff] [blame] | 390 | num_process_times_ = 0; |
Peter Boström | e449915 | 2016-02-05 11:13:28 +0100 | [diff] [blame] | 391 | metrics_ = rtc::Optional<CpuOveruseMetrics>(); |
asapersson@webrtc.org | b60346e | 2014-02-17 19:02:15 +0000 | [diff] [blame] | 392 | } |
| 393 | |
perkj | d52063f | 2016-09-07 06:32:18 -0700 | [diff] [blame] | 394 | void OveruseFrameDetector::FrameCaptured(const VideoFrame& frame, |
nisse | e0e3bdf | 2017-01-18 02:16:20 -0800 | [diff] [blame] | 395 | int64_t time_when_first_seen_us) { |
perkj | d52063f | 2016-09-07 06:32:18 -0700 | [diff] [blame] | 396 | RTC_DCHECK_CALLED_SEQUENTIALLY(&task_checker_); |
asapersson@webrtc.org | e2af622 | 2013-09-23 20:05:39 +0000 | [diff] [blame] | 397 | |
Peter Boström | e449915 | 2016-02-05 11:13:28 +0100 | [diff] [blame] | 398 | if (FrameSizeChanged(frame.width() * frame.height()) || |
nisse | e0e3bdf | 2017-01-18 02:16:20 -0800 | [diff] [blame] | 399 | FrameTimeoutDetected(time_when_first_seen_us)) { |
Peter Boström | e449915 | 2016-02-05 11:13:28 +0100 | [diff] [blame] | 400 | ResetAll(frame.width() * frame.height()); |
asapersson@webrtc.org | e2af622 | 2013-09-23 20:05:39 +0000 | [diff] [blame] | 401 | } |
| 402 | |
nisse | e0e3bdf | 2017-01-18 02:16:20 -0800 | [diff] [blame] | 403 | if (last_capture_time_us_ != -1) |
| 404 | usage_->AddCaptureSample( |
| 405 | 1e-3 * (time_when_first_seen_us - last_capture_time_us_)); |
Åsa Persson | 746210f | 2015-09-08 10:52:42 +0200 | [diff] [blame] | 406 | |
nisse | e0e3bdf | 2017-01-18 02:16:20 -0800 | [diff] [blame] | 407 | last_capture_time_us_ = time_when_first_seen_us; |
asapersson@webrtc.org | 9e5b034 | 2013-12-04 13:47:44 +0000 | [diff] [blame] | 408 | |
nisse | e0e3bdf | 2017-01-18 02:16:20 -0800 | [diff] [blame] | 409 | frame_timing_.push_back(FrameTiming(frame.timestamp_us(), frame.timestamp(), |
| 410 | time_when_first_seen_us)); |
asapersson@webrtc.org | 9aed002 | 2014-10-16 06:57:12 +0000 | [diff] [blame] | 411 | } |
| 412 | |
perkj | d52063f | 2016-09-07 06:32:18 -0700 | [diff] [blame] | 413 | void OveruseFrameDetector::FrameSent(uint32_t timestamp, |
nisse | e0e3bdf | 2017-01-18 02:16:20 -0800 | [diff] [blame] | 414 | int64_t time_sent_in_us) { |
perkj | d52063f | 2016-09-07 06:32:18 -0700 | [diff] [blame] | 415 | RTC_DCHECK_CALLED_SEQUENTIALLY(&task_checker_); |
Peter Boström | e449915 | 2016-02-05 11:13:28 +0100 | [diff] [blame] | 416 | // Delay before reporting actual encoding time, used to have the ability to |
| 417 | // detect total encoding time when encoding more than one layer. Encoding is |
| 418 | // here assumed to finish within a second (or that we get enough long-time |
| 419 | // samples before one second to trigger an overuse even when this is not the |
| 420 | // case). |
| 421 | static const int64_t kEncodingTimeMeasureWindowMs = 1000; |
Peter Boström | e449915 | 2016-02-05 11:13:28 +0100 | [diff] [blame] | 422 | for (auto& it : frame_timing_) { |
| 423 | if (it.timestamp == timestamp) { |
nisse | e0e3bdf | 2017-01-18 02:16:20 -0800 | [diff] [blame] | 424 | it.last_send_us = time_sent_in_us; |
Peter Boström | e449915 | 2016-02-05 11:13:28 +0100 | [diff] [blame] | 425 | break; |
| 426 | } |
asapersson@webrtc.org | 9aed002 | 2014-10-16 06:57:12 +0000 | [diff] [blame] | 427 | } |
Peter Boström | e449915 | 2016-02-05 11:13:28 +0100 | [diff] [blame] | 428 | // TODO(pbos): Handle the case/log errors when not finding the corresponding |
| 429 | // frame (either very slow encoding or incorrect wrong timestamps returned |
| 430 | // from the encoder). |
| 431 | // This is currently the case for all frames on ChromeOS, so logging them |
| 432 | // would be spammy, and triggering overuse would be wrong. |
| 433 | // https://crbug.com/350106 |
| 434 | while (!frame_timing_.empty()) { |
| 435 | FrameTiming timing = frame_timing_.front(); |
nisse | e0e3bdf | 2017-01-18 02:16:20 -0800 | [diff] [blame] | 436 | if (time_sent_in_us - timing.capture_us < |
sprang | c5d62e2 | 2017-04-02 23:53:04 -0700 | [diff] [blame^] | 437 | kEncodingTimeMeasureWindowMs * rtc::kNumMicrosecsPerMillisec) { |
Peter Boström | e449915 | 2016-02-05 11:13:28 +0100 | [diff] [blame] | 438 | break; |
sprang | c5d62e2 | 2017-04-02 23:53:04 -0700 | [diff] [blame^] | 439 | } |
nisse | e0e3bdf | 2017-01-18 02:16:20 -0800 | [diff] [blame] | 440 | if (timing.last_send_us != -1) { |
| 441 | int encode_duration_us = |
| 442 | static_cast<int>(timing.last_send_us - timing.capture_us); |
Peter Boström | e449915 | 2016-02-05 11:13:28 +0100 | [diff] [blame] | 443 | if (encoder_timing_) { |
nisse | e0e3bdf | 2017-01-18 02:16:20 -0800 | [diff] [blame] | 444 | // TODO(nisse): Update encoder_timing_ to also use us units. |
| 445 | encoder_timing_->OnEncodeTiming(timing.capture_time_us / |
| 446 | rtc::kNumMicrosecsPerMillisec, |
| 447 | encode_duration_us / |
| 448 | rtc::kNumMicrosecsPerMillisec); |
Peter Boström | e449915 | 2016-02-05 11:13:28 +0100 | [diff] [blame] | 449 | } |
nisse | e0e3bdf | 2017-01-18 02:16:20 -0800 | [diff] [blame] | 450 | if (last_processed_capture_time_us_ != -1) { |
| 451 | int64_t diff_us = timing.capture_us - last_processed_capture_time_us_; |
| 452 | usage_->AddSample(1e-3 * encode_duration_us, 1e-3 * diff_us); |
Peter Boström | e449915 | 2016-02-05 11:13:28 +0100 | [diff] [blame] | 453 | } |
nisse | e0e3bdf | 2017-01-18 02:16:20 -0800 | [diff] [blame] | 454 | last_processed_capture_time_us_ = timing.capture_us; |
| 455 | EncodedFrameTimeMeasured(encode_duration_us / |
| 456 | rtc::kNumMicrosecsPerMillisec); |
Peter Boström | e449915 | 2016-02-05 11:13:28 +0100 | [diff] [blame] | 457 | } |
| 458 | frame_timing_.pop_front(); |
| 459 | } |
asapersson@webrtc.org | c7ff8f9 | 2013-11-26 11:12:33 +0000 | [diff] [blame] | 460 | } |
| 461 | |
perkj | d52063f | 2016-09-07 06:32:18 -0700 | [diff] [blame] | 462 | void OveruseFrameDetector::CheckForOveruse() { |
| 463 | RTC_DCHECK_CALLED_SEQUENTIALLY(&task_checker_); |
| 464 | ++num_process_times_; |
| 465 | if (num_process_times_ <= options_.min_process_count || !metrics_) |
| 466 | return; |
pbos@webrtc.org | a957570 | 2013-08-30 17:16:32 +0000 | [diff] [blame] | 467 | |
nisse | e0e3bdf | 2017-01-18 02:16:20 -0800 | [diff] [blame] | 468 | int64_t now_ms = rtc::TimeMillis(); |
pbos@webrtc.org | a957570 | 2013-08-30 17:16:32 +0000 | [diff] [blame] | 469 | |
perkj | d52063f | 2016-09-07 06:32:18 -0700 | [diff] [blame] | 470 | if (IsOverusing(*metrics_)) { |
pbos@webrtc.org | a957570 | 2013-08-30 17:16:32 +0000 | [diff] [blame] | 471 | // If the last thing we did was going up, and now have to back down, we need |
| 472 | // to check if this peak was short. If so we should back off to avoid going |
| 473 | // back and forth between this load, the system doesn't seem to handle it. |
Peter Boström | e449915 | 2016-02-05 11:13:28 +0100 | [diff] [blame] | 474 | bool check_for_backoff = last_rampup_time_ms_ > last_overuse_time_ms_; |
pbos@webrtc.org | a957570 | 2013-08-30 17:16:32 +0000 | [diff] [blame] | 475 | if (check_for_backoff) { |
nisse | e0e3bdf | 2017-01-18 02:16:20 -0800 | [diff] [blame] | 476 | if (now_ms - last_rampup_time_ms_ < kStandardRampUpDelayMs || |
asapersson@webrtc.org | d980307 | 2014-06-16 14:27:19 +0000 | [diff] [blame] | 477 | num_overuse_detections_ > kMaxOverusesBeforeApplyRampupDelay) { |
pbos@webrtc.org | a957570 | 2013-08-30 17:16:32 +0000 | [diff] [blame] | 478 | // Going up was not ok for very long, back off. |
| 479 | current_rampup_delay_ms_ *= kRampUpBackoffFactor; |
| 480 | if (current_rampup_delay_ms_ > kMaxRampUpDelayMs) |
| 481 | current_rampup_delay_ms_ = kMaxRampUpDelayMs; |
| 482 | } else { |
| 483 | // Not currently backing off, reset rampup delay. |
| 484 | current_rampup_delay_ms_ = kStandardRampUpDelayMs; |
| 485 | } |
| 486 | } |
| 487 | |
nisse | e0e3bdf | 2017-01-18 02:16:20 -0800 | [diff] [blame] | 488 | last_overuse_time_ms_ = now_ms; |
pbos@webrtc.org | a957570 | 2013-08-30 17:16:32 +0000 | [diff] [blame] | 489 | in_quick_rampup_ = false; |
| 490 | checks_above_threshold_ = 0; |
asapersson@webrtc.org | d980307 | 2014-06-16 14:27:19 +0000 | [diff] [blame] | 491 | ++num_overuse_detections_; |
pbos@webrtc.org | a957570 | 2013-08-30 17:16:32 +0000 | [diff] [blame] | 492 | |
Peter Boström | 74f6e9e | 2016-04-04 17:56:10 +0200 | [diff] [blame] | 493 | if (observer_) |
sprang | b1ca073 | 2017-02-01 08:38:12 -0800 | [diff] [blame] | 494 | observer_->AdaptDown(kScaleReasonCpu); |
nisse | e0e3bdf | 2017-01-18 02:16:20 -0800 | [diff] [blame] | 495 | } else if (IsUnderusing(*metrics_, now_ms)) { |
| 496 | last_rampup_time_ms_ = now_ms; |
pbos@webrtc.org | a957570 | 2013-08-30 17:16:32 +0000 | [diff] [blame] | 497 | in_quick_rampup_ = true; |
| 498 | |
Peter Boström | 74f6e9e | 2016-04-04 17:56:10 +0200 | [diff] [blame] | 499 | if (observer_) |
sprang | b1ca073 | 2017-02-01 08:38:12 -0800 | [diff] [blame] | 500 | observer_->AdaptUp(kScaleReasonCpu); |
mflodman@webrtc.org | e6168f5 | 2013-06-26 11:23:01 +0000 | [diff] [blame] | 501 | } |
pbos@webrtc.org | a957570 | 2013-08-30 17:16:32 +0000 | [diff] [blame] | 502 | |
mflodman@webrtc.org | 5574dac | 2014-04-07 10:56:31 +0000 | [diff] [blame] | 503 | int rampup_delay = |
| 504 | in_quick_rampup_ ? kQuickRampUpDelayMs : current_rampup_delay_ms_; |
asapersson | 74d85e1 | 2015-09-24 00:53:32 -0700 | [diff] [blame] | 505 | |
| 506 | LOG(LS_VERBOSE) << " Frame stats: " |
perkj | d52063f | 2016-09-07 06:32:18 -0700 | [diff] [blame] | 507 | << " encode usage " << metrics_->encode_usage_percent |
asapersson@webrtc.org | d980307 | 2014-06-16 14:27:19 +0000 | [diff] [blame] | 508 | << " overuse detections " << num_overuse_detections_ |
| 509 | << " rampup delay " << rampup_delay; |
asapersson@webrtc.org | e2af622 | 2013-09-23 20:05:39 +0000 | [diff] [blame] | 510 | } |
| 511 | |
asapersson | 74d85e1 | 2015-09-24 00:53:32 -0700 | [diff] [blame] | 512 | bool OveruseFrameDetector::IsOverusing(const CpuOveruseMetrics& metrics) { |
perkj | d52063f | 2016-09-07 06:32:18 -0700 | [diff] [blame] | 513 | RTC_DCHECK_CALLED_SEQUENTIALLY(&task_checker_); |
sprang | c5d62e2 | 2017-04-02 23:53:04 -0700 | [diff] [blame^] | 514 | |
Peter Boström | 01f364e | 2016-01-07 16:38:25 +0100 | [diff] [blame] | 515 | if (metrics.encode_usage_percent >= |
| 516 | options_.high_encode_usage_threshold_percent) { |
pbos@webrtc.org | a957570 | 2013-08-30 17:16:32 +0000 | [diff] [blame] | 517 | ++checks_above_threshold_; |
| 518 | } else { |
| 519 | checks_above_threshold_ = 0; |
| 520 | } |
asapersson@webrtc.org | 8a8c3ef | 2014-03-20 13:15:01 +0000 | [diff] [blame] | 521 | return checks_above_threshold_ >= options_.high_threshold_consecutive_count; |
mflodman@webrtc.org | d4412fe | 2013-07-31 16:42:21 +0000 | [diff] [blame] | 522 | } |
| 523 | |
asapersson | 74d85e1 | 2015-09-24 00:53:32 -0700 | [diff] [blame] | 524 | bool OveruseFrameDetector::IsUnderusing(const CpuOveruseMetrics& metrics, |
| 525 | int64_t time_now) { |
perkj | d52063f | 2016-09-07 06:32:18 -0700 | [diff] [blame] | 526 | RTC_DCHECK_CALLED_SEQUENTIALLY(&task_checker_); |
pbos@webrtc.org | a957570 | 2013-08-30 17:16:32 +0000 | [diff] [blame] | 527 | int delay = in_quick_rampup_ ? kQuickRampUpDelayMs : current_rampup_delay_ms_; |
Peter Boström | e449915 | 2016-02-05 11:13:28 +0100 | [diff] [blame] | 528 | if (time_now < last_rampup_time_ms_ + delay) |
mflodman@webrtc.org | d4412fe | 2013-07-31 16:42:21 +0000 | [diff] [blame] | 529 | return false; |
mflodman@webrtc.org | d4412fe | 2013-07-31 16:42:21 +0000 | [diff] [blame] | 530 | |
Peter Boström | 01f364e | 2016-01-07 16:38:25 +0100 | [diff] [blame] | 531 | return metrics.encode_usage_percent < |
| 532 | options_.low_encode_usage_threshold_percent; |
mflodman@webrtc.org | d4412fe | 2013-07-31 16:42:21 +0000 | [diff] [blame] | 533 | } |
mflodman@webrtc.org | e6168f5 | 2013-06-26 11:23:01 +0000 | [diff] [blame] | 534 | } // namespace webrtc |