admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Add histogram for FallbackDesktopCapturerWrapper and BlankDetectorDesktopCapturerWrapper"

Browse Source 
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 <jamiewalch@chromium.org>
> Commit-Queue: Zijie He <zijiehe@chromium.org>
> 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 <mbonadei@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#19230}
This commit is contained in:
Mirko Bonadei 2017-08-03 09:54:51 +00:00 committed by Commit Bot
parent 85375d9d34
commit 9b1b4105a4
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
webrtc/modules/desktop_capture/blank_detector_desktop_capturer_wrapper.cc
View File

@ -15,7 +15,6 @@
#include "webrtc/modules/desktop_capture/desktop_geometry.h" #include "webrtc/modules/desktop_capture/desktop_geometry.h"
#include "webrtc/rtc_base/checks.h" #include "webrtc/rtc_base/checks.h"
#include "webrtc/system_wrappers/include/metrics.h"
namespace webrtc { namespace webrtc {
@ -79,8 +78,6 @@ void BlankDetectorDesktopCapturerWrapper::OnCaptureResult(
last_frame_is_blank_ = IsBlankFrame(*frame); last_frame_is_blank_ = IsBlankFrame(*frame);
is_first_frame_ = false; is_first_frame_ = false;
} }
RTC_HISTOGRAM_BOOLEAN("WebRTC.DesktopCapture.BlankFrameDetected",
last_frame_is_blank_);
if (!last_frame_is_blank_) { if (!last_frame_is_blank_) {
non_blank_frame_received_ = true; non_blank_frame_received_ = true;
callback_->OnCaptureResult(Result::SUCCESS, std::move(frame)); callback_->OnCaptureResult(Result::SUCCESS, std::move(frame));

5
webrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper.cc
View File

@ -13,7 +13,6 @@
#include <utility> #include <utility>
#include "webrtc/rtc_base/checks.h" #include "webrtc/rtc_base/checks.h"
#include "webrtc/system_wrappers/include/metrics.h"
namespace webrtc { namespace webrtc {
@ -146,10 +145,6 @@ void FallbackDesktopCapturerWrapper::OnCaptureResult(
Result result, Result result,
std::unique_ptr<DesktopFrame> frame) { std::unique_ptr<DesktopFrame> frame) {
RTC_DCHECK(callback_); 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) { if (result == Result::SUCCESS) {
callback_->OnCaptureResult(result, std::move(frame)); callback_->OnCaptureResult(result, std::move(frame));
return; return;