Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(957)

Unified Diff: webrtc/video/overuse_frame_detector.cc

Issue 2398963003: Move usage of QualityScaler to ViEEncoder. (Closed)
Patch Set: rebase Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/video/overuse_frame_detector.cc
diff --git a/webrtc/video/overuse_frame_detector.cc b/webrtc/video/overuse_frame_detector.cc
index bb89864bb0409f9bbee1a95168697266b9654238..d09aa7869df20f6cc8328b44cd9184fa816b0a8b 100644
--- a/webrtc/video/overuse_frame_detector.cc
+++ b/webrtc/video/overuse_frame_detector.cc
@@ -49,6 +49,7 @@ const int kMaxOverusesBeforeApplyRampupDelay = 4;
const float kSampleDiffMs = 33.0f;
const float kMaxExp = 7.0f;
+const auto scale_reason_ = ScalingObserverInterface::ScaleReason::kCpu;
perkj_webrtc 2016/11/14 07:21:16 nit: / / This is not a member, just a const so nam
kthelgason 2016/11/14 14:36:44 done. Used to be a member, that's why it's named l
} // namespace
CpuOveruseOptions::CpuOveruseOptions()
@@ -204,7 +205,7 @@ class OveruseFrameDetector::CheckOveruseTask : public rtc::QueuedTask {
OveruseFrameDetector::OveruseFrameDetector(
Clock* clock,
const CpuOveruseOptions& options,
- CpuOveruseObserver* observer,
+ ScalingObserverInterface* observer,
EncodedFrameObserver* encoder_timing,
CpuOveruseMetricsObserver* metrics_observer)
: check_overuse_task_(nullptr),
@@ -370,13 +371,13 @@ void OveruseFrameDetector::CheckForOveruse() {
++num_overuse_detections_;
if (observer_)
- observer_->OveruseDetected();
+ observer_->ScaleDown(scale_reason_);
} else if (IsUnderusing(*metrics_, now)) {
last_rampup_time_ms_ = now;
in_quick_rampup_ = true;
if (observer_)
- observer_->NormalUsage();
+ observer_->ScaleUp(scale_reason_);
}
int rampup_delay =

Powered by Google App Engine
This is Rietveld 408576698