OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 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 | 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 | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
11 #include "webrtc/video/vie_encoder.h" | 11 #include "webrtc/video/vie_encoder.h" |
12 | 12 |
13 #include <algorithm> | 13 #include <algorithm> |
14 #include <limits> | 14 #include <limits> |
| 15 #include <numeric> |
15 #include <utility> | 16 #include <utility> |
16 | 17 |
17 #include "webrtc/base/arraysize.h" | 18 #include "webrtc/base/arraysize.h" |
18 #include "webrtc/base/checks.h" | 19 #include "webrtc/base/checks.h" |
19 #include "webrtc/base/location.h" | 20 #include "webrtc/base/location.h" |
20 #include "webrtc/base/logging.h" | 21 #include "webrtc/base/logging.h" |
21 #include "webrtc/base/timeutils.h" | 22 #include "webrtc/base/timeutils.h" |
22 #include "webrtc/base/trace_event.h" | 23 #include "webrtc/base/trace_event.h" |
23 #include "webrtc/common_video/include/video_bitrate_allocator.h" | 24 #include "webrtc/common_video/include/video_bitrate_allocator.h" |
24 #include "webrtc/modules/pacing/paced_sender.h" | 25 #include "webrtc/modules/pacing/paced_sender.h" |
(...skipping 10 matching lines...) Expand all Loading... |
35 using DegradationPreference = VideoSendStream::DegradationPreference; | 36 using DegradationPreference = VideoSendStream::DegradationPreference; |
36 | 37 |
37 // Time interval for logging frame counts. | 38 // Time interval for logging frame counts. |
38 const int64_t kFrameLogIntervalMs = 60000; | 39 const int64_t kFrameLogIntervalMs = 60000; |
39 | 40 |
40 // We will never ask for a resolution lower than this. | 41 // We will never ask for a resolution lower than this. |
41 // TODO(kthelgason): Lower this limit when better testing | 42 // TODO(kthelgason): Lower this limit when better testing |
42 // on MediaCodec and fallback implementations are in place. | 43 // on MediaCodec and fallback implementations are in place. |
43 // See https://bugs.chromium.org/p/webrtc/issues/detail?id=7206 | 44 // See https://bugs.chromium.org/p/webrtc/issues/detail?id=7206 |
44 const int kMinPixelsPerFrame = 320 * 180; | 45 const int kMinPixelsPerFrame = 320 * 180; |
| 46 const int kMinFramerateFps = 2; |
45 | 47 |
46 // The maximum number of frames to drop at beginning of stream | 48 // The maximum number of frames to drop at beginning of stream |
47 // to try and achieve desired bitrate. | 49 // to try and achieve desired bitrate. |
48 const int kMaxInitialFramedrop = 4; | 50 const int kMaxInitialFramedrop = 4; |
49 | 51 |
50 // TODO(pbos): Lower these thresholds (to closer to 100%) when we handle | 52 // TODO(pbos): Lower these thresholds (to closer to 100%) when we handle |
51 // pipelining encoders better (multiple input frames before something comes | 53 // pipelining encoders better (multiple input frames before something comes |
52 // out). This should effectively turn off CPU adaptations for systems that | 54 // out). This should effectively turn off CPU adaptations for systems that |
53 // remotely cope with the load right now. | 55 // remotely cope with the load right now. |
54 CpuOveruseOptions GetCpuOveruseOptions(bool full_overuse_time) { | 56 CpuOveruseOptions GetCpuOveruseOptions(bool full_overuse_time) { |
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
143 }; | 145 }; |
144 | 146 |
145 // VideoSourceProxy is responsible ensuring thread safety between calls to | 147 // VideoSourceProxy is responsible ensuring thread safety between calls to |
146 // ViEEncoder::SetSource that will happen on libjingle's worker thread when a | 148 // ViEEncoder::SetSource that will happen on libjingle's worker thread when a |
147 // video capturer is connected to the encoder and the encoder task queue | 149 // video capturer is connected to the encoder and the encoder task queue |
148 // (encoder_queue_) where the encoder reports its VideoSinkWants. | 150 // (encoder_queue_) where the encoder reports its VideoSinkWants. |
149 class ViEEncoder::VideoSourceProxy { | 151 class ViEEncoder::VideoSourceProxy { |
150 public: | 152 public: |
151 explicit VideoSourceProxy(ViEEncoder* vie_encoder) | 153 explicit VideoSourceProxy(ViEEncoder* vie_encoder) |
152 : vie_encoder_(vie_encoder), | 154 : vie_encoder_(vie_encoder), |
153 degradation_preference_(DegradationPreference::kMaintainResolution), | 155 degradation_preference_(DegradationPreference::kDegradationDisabled), |
154 source_(nullptr) {} | 156 source_(nullptr) {} |
155 | 157 |
156 void SetSource(rtc::VideoSourceInterface<VideoFrame>* source, | 158 void SetSource(rtc::VideoSourceInterface<VideoFrame>* source, |
157 const DegradationPreference& degradation_preference) { | 159 const DegradationPreference& degradation_preference) { |
158 // Called on libjingle's worker thread. | 160 // Called on libjingle's worker thread. |
159 RTC_DCHECK_CALLED_SEQUENTIALLY(&main_checker_); | 161 RTC_DCHECK_CALLED_SEQUENTIALLY(&main_checker_); |
160 rtc::VideoSourceInterface<VideoFrame>* old_source = nullptr; | 162 rtc::VideoSourceInterface<VideoFrame>* old_source = nullptr; |
161 rtc::VideoSinkWants wants; | 163 rtc::VideoSinkWants wants; |
162 { | 164 { |
163 rtc::CritScope lock(&crit_); | 165 rtc::CritScope lock(&crit_); |
| 166 degradation_preference_ = degradation_preference; |
164 old_source = source_; | 167 old_source = source_; |
165 source_ = source; | 168 source_ = source; |
166 degradation_preference_ = degradation_preference; | 169 wants = GetActiveSinkWants(); |
167 wants = current_wants(); | |
168 } | 170 } |
169 | 171 |
170 if (old_source != source && old_source != nullptr) { | 172 if (old_source != source && old_source != nullptr) { |
171 old_source->RemoveSink(vie_encoder_); | 173 old_source->RemoveSink(vie_encoder_); |
172 } | 174 } |
173 | 175 |
174 if (!source) { | 176 if (!source) { |
175 return; | 177 return; |
176 } | 178 } |
177 | 179 |
178 source->AddOrUpdateSink(vie_encoder_, wants); | 180 source->AddOrUpdateSink(vie_encoder_, wants); |
179 } | 181 } |
180 | 182 |
181 void SetWantsRotationApplied(bool rotation_applied) { | 183 void SetWantsRotationApplied(bool rotation_applied) { |
182 rtc::CritScope lock(&crit_); | 184 rtc::CritScope lock(&crit_); |
183 sink_wants_.rotation_applied = rotation_applied; | 185 sink_wants_.rotation_applied = rotation_applied; |
184 disabled_scaling_sink_wants_.rotation_applied = rotation_applied; | 186 if (source_) |
185 if (source_) { | 187 source_->AddOrUpdateSink(vie_encoder_, sink_wants_); |
186 source_->AddOrUpdateSink(vie_encoder_, current_wants()); | 188 } |
| 189 |
| 190 rtc::VideoSinkWants GetActiveSinkWants() EXCLUSIVE_LOCKS_REQUIRED(&crit_) { |
| 191 rtc::VideoSinkWants wants = sink_wants_; |
| 192 // Clear any constraints from the current sink wants that don't apply to |
| 193 // the used degradation_preference. |
| 194 switch (degradation_preference_) { |
| 195 case DegradationPreference::kBalanced: |
| 196 FALLTHROUGH(); |
| 197 case DegradationPreference::kMaintainFramerate: |
| 198 wants.max_framerate_fps = std::numeric_limits<int>::max(); |
| 199 break; |
| 200 case DegradationPreference::kMaintainResolution: |
| 201 wants.max_pixel_count = std::numeric_limits<int>::max(); |
| 202 wants.target_pixel_count.reset(); |
| 203 break; |
| 204 case DegradationPreference::kDegradationDisabled: |
| 205 wants.max_pixel_count = std::numeric_limits<int>::max(); |
| 206 wants.target_pixel_count.reset(); |
| 207 wants.max_framerate_fps = std::numeric_limits<int>::max(); |
187 } | 208 } |
| 209 return wants; |
188 } | 210 } |
189 | 211 |
190 void RequestResolutionLowerThan(int pixel_count) { | 212 void RequestResolutionLowerThan(int pixel_count) { |
191 // Called on the encoder task queue. | 213 // Called on the encoder task queue. |
192 rtc::CritScope lock(&crit_); | 214 rtc::CritScope lock(&crit_); |
193 if (!IsResolutionScalingEnabledLocked()) { | 215 if (!IsResolutionScalingEnabledLocked()) { |
194 // This can happen since |degradation_preference_| is set on | 216 // This can happen since |degradation_preference_| is set on |
195 // libjingle's worker thread but the adaptation is done on the encoder | 217 // libjingle's worker thread but the adaptation is done on the encoder |
196 // task queue. | 218 // task queue. |
197 return; | 219 return; |
198 } | 220 } |
199 // The input video frame size will have a resolution with less than or | 221 // The input video frame size will have a resolution with less than or |
200 // equal to |max_pixel_count| depending on how the source can scale the | 222 // equal to |max_pixel_count| depending on how the source can scale the |
201 // input frame size. | 223 // input frame size. |
202 const int pixels_wanted = (pixel_count * 3) / 5; | 224 const int pixels_wanted = (pixel_count * 3) / 5; |
203 if (pixels_wanted < kMinPixelsPerFrame) | 225 if (pixels_wanted < kMinPixelsPerFrame) |
204 return; | 226 return; |
205 sink_wants_.max_pixel_count = rtc::Optional<int>(pixels_wanted); | 227 sink_wants_.max_pixel_count = pixels_wanted; |
206 sink_wants_.target_pixel_count = rtc::Optional<int>(); | 228 sink_wants_.target_pixel_count = rtc::Optional<int>(); |
207 if (source_) | 229 if (source_) |
208 source_->AddOrUpdateSink(vie_encoder_, sink_wants_); | 230 source_->AddOrUpdateSink(vie_encoder_, GetActiveSinkWants()); |
| 231 } |
| 232 |
| 233 void RequestFramerateLowerThan(int framerate_fps) { |
| 234 // Called on the encoder task queue. |
| 235 rtc::CritScope lock(&crit_); |
| 236 if (!IsFramerateScalingEnabledLocked()) { |
| 237 // This can happen since |degradation_preference_| is set on |
| 238 // libjingle's worker thread but the adaptation is done on the encoder |
| 239 // task queue. |
| 240 return; |
| 241 } |
| 242 // The input video frame rate will be scaled down to 2/3 of input fps, |
| 243 // rounding down. |
| 244 const int framerate_wanted = |
| 245 std::max(kMinFramerateFps, (framerate_fps * 2) / 3); |
| 246 sink_wants_.max_framerate_fps = framerate_wanted; |
| 247 if (source_) |
| 248 source_->AddOrUpdateSink(vie_encoder_, GetActiveSinkWants()); |
209 } | 249 } |
210 | 250 |
211 void RequestHigherResolutionThan(int pixel_count) { | 251 void RequestHigherResolutionThan(int pixel_count) { |
212 rtc::CritScope lock(&crit_); | 252 rtc::CritScope lock(&crit_); |
213 if (!IsResolutionScalingEnabledLocked()) { | 253 if (!IsResolutionScalingEnabledLocked()) { |
214 // This can happen since |degradation_preference_| is set on | 254 // This can happen since |degradation_preference_| is set on |
215 // libjingle's worker thread but the adaptation is done on the encoder | 255 // libjingle's worker thread but the adaptation is done on the encoder |
216 // task queue. | 256 // task queue. |
217 return; | 257 return; |
218 } | 258 } |
219 // On step down we request at most 3/5 the pixel count of the previous | 259 |
220 // resolution, so in order to take "one step up" we request a resolution as | 260 if (pixel_count == std::numeric_limits<int>::max()) { |
221 // close as possible to 5/3 of the current resolution. The actual pixel | 261 // Remove any constraints. |
222 // count selected depends on the capabilities of the source. In order to not | 262 sink_wants_.target_pixel_count.reset(); |
223 // take a too large step up, we cap the requested pixel count to be at most | 263 sink_wants_.max_pixel_count = std::numeric_limits<int>::max(); |
224 // four time the current number of pixels. | 264 } else { |
225 sink_wants_.target_pixel_count = rtc::Optional<int>((pixel_count * 5) / 3); | 265 // On step down we request at most 3/5 the pixel count of the previous |
226 sink_wants_.max_pixel_count = rtc::Optional<int>(pixel_count * 4); | 266 // resolution, so in order to take "one step up" we request a resolution |
| 267 // as close as possible to 5/3 of the current resolution. The actual pixel |
| 268 // count selected depends on the capabilities of the source. In order to |
| 269 // not take a too large step up, we cap the requested pixel count to be at |
| 270 // most four time the current number of pixels. |
| 271 sink_wants_.target_pixel_count = |
| 272 rtc::Optional<int>((pixel_count * 5) / 3); |
| 273 sink_wants_.max_pixel_count = pixel_count * 4; |
| 274 } |
227 if (source_) | 275 if (source_) |
228 source_->AddOrUpdateSink(vie_encoder_, sink_wants_); | 276 source_->AddOrUpdateSink(vie_encoder_, GetActiveSinkWants()); |
| 277 } |
| 278 |
| 279 void RequestHigherFramerateThan(int framerate_fps) { |
| 280 // Called on the encoder task queue. |
| 281 rtc::CritScope lock(&crit_); |
| 282 if (!IsFramerateScalingEnabledLocked()) { |
| 283 // This can happen since |degradation_preference_| is set on |
| 284 // libjingle's worker thread but the adaptation is done on the encoder |
| 285 // task queue. |
| 286 return; |
| 287 } |
| 288 if (framerate_fps == std::numeric_limits<int>::max()) { |
| 289 // Remove any restrains. |
| 290 sink_wants_.max_framerate_fps = std::numeric_limits<int>::max(); |
| 291 } else { |
| 292 // The input video frame rate will be scaled up to the last step, with |
| 293 // rounding. |
| 294 const int framerate_wanted = (framerate_fps * 3) / 2; |
| 295 sink_wants_.max_framerate_fps = framerate_wanted; |
| 296 } |
| 297 if (source_) |
| 298 source_->AddOrUpdateSink(vie_encoder_, GetActiveSinkWants()); |
229 } | 299 } |
230 | 300 |
231 private: | 301 private: |
232 bool IsResolutionScalingEnabledLocked() const | 302 bool IsResolutionScalingEnabledLocked() const |
233 EXCLUSIVE_LOCKS_REQUIRED(&crit_) { | 303 EXCLUSIVE_LOCKS_REQUIRED(&crit_) { |
234 return degradation_preference_ != | 304 return degradation_preference_ != |
235 DegradationPreference::kMaintainResolution; | 305 DegradationPreference::kMaintainResolution; |
236 } | 306 } |
237 | 307 |
238 const rtc::VideoSinkWants& current_wants() const | 308 bool IsFramerateScalingEnabledLocked() const |
239 EXCLUSIVE_LOCKS_REQUIRED(&crit_) { | 309 EXCLUSIVE_LOCKS_REQUIRED(&crit_) { |
240 return IsResolutionScalingEnabledLocked() ? sink_wants_ | 310 return degradation_preference_ == |
241 : disabled_scaling_sink_wants_; | 311 DegradationPreference::kMaintainResolution; |
242 } | 312 } |
243 | 313 |
244 rtc::CriticalSection crit_; | 314 rtc::CriticalSection crit_; |
245 rtc::SequencedTaskChecker main_checker_; | 315 rtc::SequencedTaskChecker main_checker_; |
246 ViEEncoder* const vie_encoder_; | 316 ViEEncoder* const vie_encoder_; |
247 rtc::VideoSinkWants sink_wants_ GUARDED_BY(&crit_); | 317 rtc::VideoSinkWants sink_wants_ GUARDED_BY(&crit_); |
248 rtc::VideoSinkWants disabled_scaling_sink_wants_ GUARDED_BY(&crit_); | |
249 DegradationPreference degradation_preference_ GUARDED_BY(&crit_); | 318 DegradationPreference degradation_preference_ GUARDED_BY(&crit_); |
250 rtc::VideoSourceInterface<VideoFrame>* source_ GUARDED_BY(&crit_); | 319 rtc::VideoSourceInterface<VideoFrame>* source_ GUARDED_BY(&crit_); |
251 | 320 |
252 RTC_DISALLOW_COPY_AND_ASSIGN(VideoSourceProxy); | 321 RTC_DISALLOW_COPY_AND_ASSIGN(VideoSourceProxy); |
253 }; | 322 }; |
254 | 323 |
255 ViEEncoder::ViEEncoder(uint32_t number_of_cores, | 324 ViEEncoder::ViEEncoder(uint32_t number_of_cores, |
256 SendStatisticsProxy* stats_proxy, | 325 SendStatisticsProxy* stats_proxy, |
257 const VideoSendStream::Config::EncoderSettings& settings, | 326 const VideoSendStream::Config::EncoderSettings& settings, |
258 rtc::VideoSinkInterface<VideoFrame>* pre_encode_callback, | 327 rtc::VideoSinkInterface<VideoFrame>* pre_encode_callback, |
(...skipping 18 matching lines...) Expand all Loading... |
277 encoder_start_bitrate_bps_(0), | 346 encoder_start_bitrate_bps_(0), |
278 max_data_payload_length_(0), | 347 max_data_payload_length_(0), |
279 nack_enabled_(false), | 348 nack_enabled_(false), |
280 last_observed_bitrate_bps_(0), | 349 last_observed_bitrate_bps_(0), |
281 encoder_paused_and_dropped_frame_(false), | 350 encoder_paused_and_dropped_frame_(false), |
282 has_received_sli_(false), | 351 has_received_sli_(false), |
283 picture_id_sli_(0), | 352 picture_id_sli_(0), |
284 has_received_rpsi_(false), | 353 has_received_rpsi_(false), |
285 picture_id_rpsi_(0), | 354 picture_id_rpsi_(0), |
286 clock_(Clock::GetRealTimeClock()), | 355 clock_(Clock::GetRealTimeClock()), |
287 scale_counter_(kScaleReasonSize, 0), | 356 degradation_preference_(DegradationPreference::kDegradationDisabled), |
288 degradation_preference_(DegradationPreference::kMaintainResolution), | |
289 last_captured_timestamp_(0), | 357 last_captured_timestamp_(0), |
290 delta_ntp_internal_ms_(clock_->CurrentNtpInMilliseconds() - | 358 delta_ntp_internal_ms_(clock_->CurrentNtpInMilliseconds() - |
291 clock_->TimeInMilliseconds()), | 359 clock_->TimeInMilliseconds()), |
292 last_frame_log_ms_(clock_->TimeInMilliseconds()), | 360 last_frame_log_ms_(clock_->TimeInMilliseconds()), |
293 captured_frame_count_(0), | 361 captured_frame_count_(0), |
294 dropped_frame_count_(0), | 362 dropped_frame_count_(0), |
295 bitrate_observer_(nullptr), | 363 bitrate_observer_(nullptr), |
296 encoder_queue_("EncoderQueue") { | 364 encoder_queue_("EncoderQueue") { |
297 RTC_DCHECK(stats_proxy); | 365 RTC_DCHECK(stats_proxy); |
298 encoder_queue_.PostTask([this] { | 366 encoder_queue_.PostTask([this] { |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
349 }); | 417 }); |
350 } | 418 } |
351 | 419 |
352 void ViEEncoder::SetSource( | 420 void ViEEncoder::SetSource( |
353 rtc::VideoSourceInterface<VideoFrame>* source, | 421 rtc::VideoSourceInterface<VideoFrame>* source, |
354 const VideoSendStream::DegradationPreference& degradation_preference) { | 422 const VideoSendStream::DegradationPreference& degradation_preference) { |
355 RTC_DCHECK_RUN_ON(&thread_checker_); | 423 RTC_DCHECK_RUN_ON(&thread_checker_); |
356 source_proxy_->SetSource(source, degradation_preference); | 424 source_proxy_->SetSource(source, degradation_preference); |
357 encoder_queue_.PostTask([this, degradation_preference] { | 425 encoder_queue_.PostTask([this, degradation_preference] { |
358 RTC_DCHECK_RUN_ON(&encoder_queue_); | 426 RTC_DCHECK_RUN_ON(&encoder_queue_); |
359 | 427 if (degradation_preference_ != degradation_preference) { |
| 428 // Reset adaptation state, so that we're not tricked into thinking there's |
| 429 // an already pending request of the same type. |
| 430 last_adaptation_request_.reset(); |
| 431 } |
360 degradation_preference_ = degradation_preference; | 432 degradation_preference_ = degradation_preference; |
361 initial_rampup_ = | 433 initial_rampup_ = |
362 degradation_preference_ != DegradationPreference::kMaintainResolution | 434 degradation_preference_ != DegradationPreference::kMaintainResolution |
363 ? 0 | 435 ? 0 |
364 : kMaxInitialFramedrop; | 436 : kMaxInitialFramedrop; |
365 ConfigureQualityScaler(); | 437 ConfigureQualityScaler(); |
366 }); | 438 }); |
367 } | 439 } |
368 | 440 |
369 void ViEEncoder::SetSink(EncoderSink* sink, bool rotation_applied) { | 441 void ViEEncoder::SetSink(EncoderSink* sink, bool rotation_applied) { |
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
468 if (scaling_settings.thresholds) { | 540 if (scaling_settings.thresholds) { |
469 quality_scaler_.reset( | 541 quality_scaler_.reset( |
470 new QualityScaler(this, *(scaling_settings.thresholds))); | 542 new QualityScaler(this, *(scaling_settings.thresholds))); |
471 } else { | 543 } else { |
472 quality_scaler_.reset(new QualityScaler(this, codec_type_)); | 544 quality_scaler_.reset(new QualityScaler(this, codec_type_)); |
473 } | 545 } |
474 } else { | 546 } else { |
475 quality_scaler_.reset(nullptr); | 547 quality_scaler_.reset(nullptr); |
476 initial_rampup_ = kMaxInitialFramedrop; | 548 initial_rampup_ = kMaxInitialFramedrop; |
477 } | 549 } |
| 550 const std::vector<int>& scale_counters = GetScaleCounters(); |
478 stats_proxy_->SetResolutionRestrictionStats( | 551 stats_proxy_->SetResolutionRestrictionStats( |
479 degradation_preference_allows_scaling, scale_counter_[kCpu] > 0, | 552 degradation_preference_allows_scaling, scale_counters[kCpu] > 0, |
480 scale_counter_[kQuality]); | 553 scale_counters[kQuality]); |
481 } | 554 } |
482 | 555 |
483 void ViEEncoder::OnFrame(const VideoFrame& video_frame) { | 556 void ViEEncoder::OnFrame(const VideoFrame& video_frame) { |
484 RTC_DCHECK_RUNS_SERIALIZED(&incoming_frame_race_checker_); | 557 RTC_DCHECK_RUNS_SERIALIZED(&incoming_frame_race_checker_); |
485 VideoFrame incoming_frame = video_frame; | 558 VideoFrame incoming_frame = video_frame; |
486 | 559 |
487 // Local time in webrtc time base. | 560 // Local time in webrtc time base. |
488 int64_t current_time_us = clock_->TimeInMicroseconds(); | 561 int64_t current_time_us = clock_->TimeInMicroseconds(); |
489 int64_t current_time_ms = current_time_us / rtc::kNumMicrosecsPerMillisec; | 562 int64_t current_time_ms = current_time_us / rtc::kNumMicrosecsPerMillisec; |
490 // TODO(nisse): This always overrides the incoming timestamp. Don't | 563 // TODO(nisse): This always overrides the incoming timestamp. Don't |
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
733 | 806 |
734 if (video_suspension_changed) { | 807 if (video_suspension_changed) { |
735 LOG(LS_INFO) << "Video suspend state changed to: " | 808 LOG(LS_INFO) << "Video suspend state changed to: " |
736 << (video_is_suspended ? "suspended" : "not suspended"); | 809 << (video_is_suspended ? "suspended" : "not suspended"); |
737 stats_proxy_->OnSuspendChange(video_is_suspended); | 810 stats_proxy_->OnSuspendChange(video_is_suspended); |
738 } | 811 } |
739 } | 812 } |
740 | 813 |
741 void ViEEncoder::AdaptDown(AdaptReason reason) { | 814 void ViEEncoder::AdaptDown(AdaptReason reason) { |
742 RTC_DCHECK_RUN_ON(&encoder_queue_); | 815 RTC_DCHECK_RUN_ON(&encoder_queue_); |
743 if (degradation_preference_ != DegradationPreference::kBalanced) | 816 AdaptationRequest adaptation_request = { |
744 return; | 817 last_frame_info_->pixel_count(), |
745 RTC_DCHECK(static_cast<bool>(last_frame_info_)); | 818 stats_proxy_->GetStats().input_frame_rate, |
746 int current_pixel_count = last_frame_info_->pixel_count(); | 819 AdaptationRequest::Mode::kAdaptDown}; |
747 if (last_adaptation_request_ && | 820 bool downgrade_requested = |
748 last_adaptation_request_->mode_ == AdaptationRequest::Mode::kAdaptDown && | 821 last_adaptation_request_ && |
749 current_pixel_count >= last_adaptation_request_->input_pixel_count_) { | 822 last_adaptation_request_->mode_ == AdaptationRequest::Mode::kAdaptDown; |
750 // Don't request lower resolution if the current resolution is not lower | 823 |
751 // than the last time we asked for the resolution to be lowered. | 824 int max_downgrades = 0; |
752 return; | 825 switch (degradation_preference_) { |
| 826 case DegradationPreference::kBalanced: |
| 827 FALLTHROUGH(); |
| 828 case DegradationPreference::kMaintainFramerate: |
| 829 max_downgrades = kMaxCpuResolutionDowngrades; |
| 830 if (downgrade_requested && |
| 831 adaptation_request.input_pixel_count_ >= |
| 832 last_adaptation_request_->input_pixel_count_) { |
| 833 // Don't request lower resolution if the current resolution is not |
| 834 // lower than the last time we asked for the resolution to be lowered. |
| 835 return; |
| 836 } |
| 837 break; |
| 838 case DegradationPreference::kMaintainResolution: |
| 839 max_downgrades = kMaxCpuFramerateDowngrades; |
| 840 if (adaptation_request.framerate_fps_ <= 0 || |
| 841 (downgrade_requested && |
| 842 adaptation_request.framerate_fps_ < kMinFramerateFps)) { |
| 843 // If no input fps estimate available, can't determine how to scale down |
| 844 // framerate. Otherwise, don't request lower framerate if we don't have |
| 845 // a valid frame rate. Since framerate, unlike resolution, is a measure |
| 846 // we have to estimate, and can fluctuate naturally over time, don't |
| 847 // make the same kind of limitations as for resolution, but trust the |
| 848 // overuse detector to not trigger too often. |
| 849 return; |
| 850 } |
| 851 break; |
| 852 case DegradationPreference::kDegradationDisabled: |
| 853 return; |
753 } | 854 } |
754 last_adaptation_request_.emplace(AdaptationRequest{ | 855 |
755 current_pixel_count, AdaptationRequest::Mode::kAdaptDown}); | 856 last_adaptation_request_.emplace(adaptation_request); |
| 857 const std::vector<int>& scale_counter = GetScaleCounters(); |
756 | 858 |
757 switch (reason) { | 859 switch (reason) { |
758 case kQuality: | 860 case kQuality: |
759 stats_proxy_->OnQualityRestrictedResolutionChanged( | 861 stats_proxy_->OnQualityRestrictedResolutionChanged(scale_counter[reason] + |
760 scale_counter_[reason] + 1); | 862 1); |
761 break; | 863 break; |
762 case kCpu: | 864 case kCpu: |
763 if (scale_counter_[reason] >= kMaxCpuDowngrades) | 865 if (scale_counter[reason] >= max_downgrades) |
764 return; | 866 return; |
765 // Update stats accordingly. | 867 // Update stats accordingly. |
766 stats_proxy_->OnCpuRestrictedResolutionChanged(true); | 868 stats_proxy_->OnCpuRestrictedResolutionChanged(true); |
767 break; | 869 break; |
768 } | 870 } |
769 ++scale_counter_[reason]; | 871 |
770 source_proxy_->RequestResolutionLowerThan(current_pixel_count); | 872 IncrementScaleCounter(reason, 1); |
771 LOG(LS_INFO) << "Scaling down resolution."; | 873 |
| 874 switch (degradation_preference_) { |
| 875 case DegradationPreference::kBalanced: |
| 876 FALLTHROUGH(); |
| 877 case DegradationPreference::kMaintainFramerate: |
| 878 source_proxy_->RequestResolutionLowerThan( |
| 879 adaptation_request.input_pixel_count_); |
| 880 LOG(LS_INFO) << "Scaling down resolution."; |
| 881 break; |
| 882 case DegradationPreference::kMaintainResolution: |
| 883 source_proxy_->RequestFramerateLowerThan( |
| 884 adaptation_request.framerate_fps_); |
| 885 LOG(LS_INFO) << "Scaling down framerate."; |
| 886 break; |
| 887 case DegradationPreference::kDegradationDisabled: |
| 888 RTC_NOTREACHED(); |
| 889 } |
| 890 |
772 for (size_t i = 0; i < kScaleReasonSize; ++i) { | 891 for (size_t i = 0; i < kScaleReasonSize; ++i) { |
773 LOG(LS_INFO) << "Scaled " << scale_counter_[i] | 892 LOG(LS_INFO) << "Scaled " << GetScaleCounters()[i] |
774 << " times for reason: " << (i ? "cpu" : "quality"); | 893 << " times for reason: " << (i ? "cpu" : "quality"); |
775 } | 894 } |
776 } | 895 } |
777 | 896 |
778 void ViEEncoder::AdaptUp(AdaptReason reason) { | 897 void ViEEncoder::AdaptUp(AdaptReason reason) { |
779 RTC_DCHECK_RUN_ON(&encoder_queue_); | 898 RTC_DCHECK_RUN_ON(&encoder_queue_); |
780 if (scale_counter_[reason] == 0 || | 899 int scale_counter = GetScaleCounters()[reason]; |
781 degradation_preference_ != DegradationPreference::kBalanced) { | 900 if (scale_counter == 0) |
782 return; | 901 return; |
| 902 RTC_DCHECK_GT(scale_counter, 0); |
| 903 AdaptationRequest adaptation_request = { |
| 904 last_frame_info_->pixel_count(), |
| 905 stats_proxy_->GetStats().input_frame_rate, |
| 906 AdaptationRequest::Mode::kAdaptUp}; |
| 907 |
| 908 bool adapt_up_requested = |
| 909 last_adaptation_request_ && |
| 910 last_adaptation_request_->mode_ == AdaptationRequest::Mode::kAdaptUp; |
| 911 switch (degradation_preference_) { |
| 912 case DegradationPreference::kBalanced: |
| 913 FALLTHROUGH(); |
| 914 case DegradationPreference::kMaintainFramerate: |
| 915 if (adapt_up_requested && |
| 916 adaptation_request.input_pixel_count_ <= |
| 917 last_adaptation_request_->input_pixel_count_) { |
| 918 // Don't request higher resolution if the current resolution is not |
| 919 // higher than the last time we asked for the resolution to be higher. |
| 920 return; |
| 921 } |
| 922 break; |
| 923 case DegradationPreference::kMaintainResolution: |
| 924 // TODO(sprang): Don't request higher framerate if we are already at |
| 925 // max requested fps? |
| 926 break; |
| 927 case DegradationPreference::kDegradationDisabled: |
| 928 return; |
783 } | 929 } |
784 // Only scale if resolution is higher than last time we requested higher | |
785 // resolution. | |
786 RTC_DCHECK(static_cast<bool>(last_frame_info_)); | |
787 int current_pixel_count = last_frame_info_->pixel_count(); | |
788 if (last_adaptation_request_ && | |
789 last_adaptation_request_->mode_ == AdaptationRequest::Mode::kAdaptUp && | |
790 current_pixel_count <= last_adaptation_request_->input_pixel_count_) { | |
791 // Don't request higher resolution if the current resolution is not higher | |
792 // than the last time we asked for the resolution to be higher. | |
793 return; | |
794 } | |
795 last_adaptation_request_.emplace(AdaptationRequest{ | |
796 current_pixel_count, AdaptationRequest::Mode::kAdaptUp}); | |
797 | 930 |
798 switch (reason) { | 931 switch (reason) { |
799 case kQuality: | 932 case kQuality: |
800 stats_proxy_->OnQualityRestrictedResolutionChanged( | 933 stats_proxy_->OnQualityRestrictedResolutionChanged(scale_counter - 1); |
801 scale_counter_[reason] - 1); | |
802 break; | 934 break; |
803 case kCpu: | 935 case kCpu: |
804 // Update stats accordingly. | 936 // Update stats accordingly. |
805 stats_proxy_->OnCpuRestrictedResolutionChanged(scale_counter_[reason] > | 937 stats_proxy_->OnCpuRestrictedResolutionChanged(scale_counter > 1); |
806 1); | |
807 break; | 938 break; |
808 } | 939 } |
809 --scale_counter_[reason]; | 940 |
810 source_proxy_->RequestHigherResolutionThan(current_pixel_count); | 941 // Decrease counter of how many times we have scaled down, for this |
811 LOG(LS_INFO) << "Scaling up resolution."; | 942 // degradation preference mode and reason. |
| 943 IncrementScaleCounter(reason, -1); |
| 944 |
| 945 // Get a sum of how many times have scaled down, in total, for this |
| 946 // degradation preference mode. If it is 0, remove any restraints. |
| 947 const std::vector<int>& current_scale_counters = GetScaleCounters(); |
| 948 const int scale_sum = std::accumulate(current_scale_counters.begin(), |
| 949 current_scale_counters.end(), 0); |
| 950 switch (degradation_preference_) { |
| 951 case DegradationPreference::kBalanced: |
| 952 FALLTHROUGH(); |
| 953 case DegradationPreference::kMaintainFramerate: |
| 954 if (scale_sum == 0) { |
| 955 LOG(LS_INFO) << "Removing resolution down-scaling setting."; |
| 956 source_proxy_->RequestHigherResolutionThan( |
| 957 std::numeric_limits<int>::max()); |
| 958 } else { |
| 959 source_proxy_->RequestHigherResolutionThan( |
| 960 adaptation_request.input_pixel_count_); |
| 961 LOG(LS_INFO) << "Scaling up resolution."; |
| 962 } |
| 963 break; |
| 964 case DegradationPreference::kMaintainResolution: |
| 965 if (scale_sum == 0) { |
| 966 LOG(LS_INFO) << "Removing framerate down-scaling setting."; |
| 967 source_proxy_->RequestHigherFramerateThan( |
| 968 std::numeric_limits<int>::max()); |
| 969 } else { |
| 970 source_proxy_->RequestHigherFramerateThan( |
| 971 adaptation_request.framerate_fps_); |
| 972 LOG(LS_INFO) << "Scaling up framerate."; |
| 973 } |
| 974 break; |
| 975 case DegradationPreference::kDegradationDisabled: |
| 976 RTC_NOTREACHED(); |
| 977 } |
| 978 |
812 for (size_t i = 0; i < kScaleReasonSize; ++i) { | 979 for (size_t i = 0; i < kScaleReasonSize; ++i) { |
813 LOG(LS_INFO) << "Scaled " << scale_counter_[i] | 980 LOG(LS_INFO) << "Scaled " << current_scale_counters[i] |
814 << " times for reason: " << (i ? "cpu" : "quality"); | 981 << " times for reason: " << (i ? "cpu" : "quality"); |
815 } | 982 } |
816 } | 983 } |
817 | 984 |
| 985 const std::vector<int>& ViEEncoder::GetScaleCounters() { |
| 986 auto it = scale_counters_.find(degradation_preference_); |
| 987 if (it == scale_counters_.end()) { |
| 988 scale_counters_[degradation_preference_].resize(kScaleReasonSize); |
| 989 return scale_counters_[degradation_preference_]; |
| 990 } |
| 991 return it->second; |
| 992 } |
| 993 |
| 994 void ViEEncoder::IncrementScaleCounter(int reason, int delta) { |
| 995 // Get the counters and validate. This may also lazily initialize the state. |
| 996 const std::vector<int>& counter = GetScaleCounters(); |
| 997 if (delta < 0) { |
| 998 RTC_DCHECK_GE(counter[reason], delta); |
| 999 } |
| 1000 scale_counters_[degradation_preference_][reason] += delta; |
| 1001 } |
| 1002 |
818 } // namespace webrtc | 1003 } // namespace webrtc |
OLD | NEW |