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

Unified Diff: webrtc/video/send_statistics_proxy.cc

Issue 2586783003: Revert of Properly report number of quality downscales in stats. (Closed)
Patch Set: Created 4 years 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
« no previous file with comments | « webrtc/video/send_statistics_proxy.h ('k') | webrtc/video/send_statistics_proxy_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video/send_statistics_proxy.cc
diff --git a/webrtc/video/send_statistics_proxy.cc b/webrtc/video/send_statistics_proxy.cc
index 6c249f70a97629eec33192ace3e11432449f0322..82d7f0dc7593bf2cd694aa69d55d8b6e91572915 100644
--- a/webrtc/video/send_statistics_proxy.cc
+++ b/webrtc/video/send_statistics_proxy.cc
@@ -506,13 +506,17 @@
uma_container_->key_frame_counter_.Add(encoded_image._frameType ==
kVideoFrameKey);
stats_.bw_limited_resolution =
- encoded_image.adapt_reason_.bw_resolutions_disabled > 0 ||
- quality_downscales_ > 0;
-
- if (quality_downscales_ != -1) {
- uma_container_->quality_limited_frame_counter_.Add(quality_downscales_ > 0);
- if (quality_downscales_ > 0)
- uma_container_->quality_downscales_counter_.Add(quality_downscales_);
+ stats_.bw_limited_resolution ||
+ encoded_image.adapt_reason_.bw_resolutions_disabled > 0;
+
+ if (encoded_image.adapt_reason_.quality_resolution_downscales != -1) {
+ bool downscaled =
+ encoded_image.adapt_reason_.quality_resolution_downscales > 0;
+ uma_container_->quality_limited_frame_counter_.Add(downscaled);
+ if (downscaled) {
+ uma_container_->quality_downscales_counter_.Add(
+ encoded_image.adapt_reason_.quality_resolution_downscales);
+ }
}
if (encoded_image.adapt_reason_.bw_resolutions_disabled != -1) {
bool bw_limited = encoded_image.adapt_reason_.bw_resolutions_disabled > 0;
@@ -583,20 +587,11 @@
uma_container_->cpu_limited_frame_counter_.Add(stats_.cpu_limited_resolution);
}
-void SendStatisticsProxy::SetResolutionRestrictionStats(
- bool scaling_enabled,
- bool cpu_restricted,
- int num_quality_downscales) {
- rtc::CritScope lock(&crit_);
- if (scaling_enabled) {
- quality_downscales_ = num_quality_downscales;
- stats_.bw_limited_resolution = quality_downscales_ > 0;
- stats_.cpu_limited_resolution = cpu_restricted;
- } else {
- stats_.bw_limited_resolution = false;
- stats_.cpu_limited_resolution = false;
- quality_downscales_ = -1;
- }
+void SendStatisticsProxy::SetResolutionRestrictionStats(bool bandwidth,
+ bool cpu) {
+ rtc::CritScope lock(&crit_);
+ stats_.bw_limited_resolution = bandwidth;
+ stats_.cpu_limited_resolution = cpu;
}
void SendStatisticsProxy::OnCpuRestrictedResolutionChanged(
@@ -607,10 +602,10 @@
}
void SendStatisticsProxy::OnQualityRestrictedResolutionChanged(
- int num_quality_downscales) {
- rtc::CritScope lock(&crit_);
- quality_downscales_ = num_quality_downscales;
- stats_.bw_limited_resolution = quality_downscales_ > 0;
+ bool restricted) {
+ rtc::CritScope lock(&crit_);
+ uma_container_->quality_downscales_counter_.Add(restricted);
+ stats_.bw_limited_resolution = restricted;
}
void SendStatisticsProxy::RtcpPacketTypesCounterUpdated(
« no previous file with comments | « webrtc/video/send_statistics_proxy.h ('k') | webrtc/video/send_statistics_proxy_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698