From 9b1b4105a48b51020404b3b51d553c0047412b97 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Thu, 3 Aug 2017 09:54:51 +0000 Subject: [PATCH] Revert "Add histogram for FallbackDesktopCapturerWrapper and BlankDetectorDesktopCapturerWrapper" This reverts commit ecf3d53088c5a0a4bf3753608537f9fe7e905f98. Reason for revert: It is blocking the WebRTC roll into Chromium (see: https://chromium-review.googlesource.com/c/599707). Affected builds are: https://build.chromium.org/p/tryserver.chromium.android/builders/android_arm64_dbg_recipe/builds/321334 https://build.chromium.org/p/tryserver.chromium.android/builders/android_clang_dbg_recipe/builds/322156 https://build.chromium.org/p/tryserver.chromium.android/builders/android_compile_dbg/builds/323005 Original change's description: > Add histogram for FallbackDesktopCapturerWrapper and BlankDetectorDesktopCapturerWrapper > > We should record the number of fallbacks and blank frames. > > Bug: webrtc:8040 > Change-Id: I92e7b7d7b4664fee6d6bd636609e80e532aa4bd4 > Reviewed-on: https://chromium-review.googlesource.com/587688 > Reviewed-by: Jamie Walch > Commit-Queue: Zijie He > Cr-Commit-Position: refs/heads/master@{#19161} TBR=jamiewalch@chromium.org,zijiehe@chromium.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:8040 Change-Id: I0d1f881e86bf437854dd265c119b0dc9c7b11ecf Reviewed-on: https://chromium-review.googlesource.com/599847 Reviewed-by: Mirko Bonadei Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#19230} --- .../blank_detector_desktop_capturer_wrapper.cc | 3 --- .../desktop_capture/fallback_desktop_capturer_wrapper.cc | 5 ----- 2 files changed, 8 deletions(-) diff --git a/webrtc/modules/desktop_capture/blank_detector_desktop_capturer_wrapper.cc b/webrtc/modules/desktop_capture/blank_detector_desktop_capturer_wrapper.cc index 4f88d94b09..13d50d5032 100644 --- a/webrtc/modules/desktop_capture/blank_detector_desktop_capturer_wrapper.cc +++ b/webrtc/modules/desktop_capture/blank_detector_desktop_capturer_wrapper.cc @@ -15,7 +15,6 @@ #include "webrtc/modules/desktop_capture/desktop_geometry.h" #include "webrtc/rtc_base/checks.h" -#include "webrtc/system_wrappers/include/metrics.h" namespace webrtc { @@ -79,8 +78,6 @@ void BlankDetectorDesktopCapturerWrapper::OnCaptureResult( last_frame_is_blank_ = IsBlankFrame(*frame); is_first_frame_ = false; } - RTC_HISTOGRAM_BOOLEAN("WebRTC.DesktopCapture.BlankFrameDetected", - last_frame_is_blank_); if (!last_frame_is_blank_) { non_blank_frame_received_ = true; callback_->OnCaptureResult(Result::SUCCESS, std::move(frame)); diff --git a/webrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper.cc b/webrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper.cc index 8051026ffd..0fd9b8aebf 100644 --- a/webrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper.cc +++ b/webrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper.cc @@ -13,7 +13,6 @@ #include #include "webrtc/rtc_base/checks.h" -#include "webrtc/system_wrappers/include/metrics.h" namespace webrtc { @@ -146,10 +145,6 @@ void FallbackDesktopCapturerWrapper::OnCaptureResult( Result result, std::unique_ptr frame) { RTC_DCHECK(callback_); - RTC_HISTOGRAM_BOOLEAN("WebRTC.DesktopCapture.PrimaryCapturerError", - result != Result::SUCCESS); - RTC_HISTOGRAM_BOOLEAN("WebRTC.DesktopCapture.PrimaryCapturerPermanentError", - result == Result::ERROR_PERMANENT); if (result == Result::SUCCESS) { callback_->OnCaptureResult(result, std::move(frame)); return;