mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-12 21:30:45 +01:00
e8ef87bdad
This change adds logic to WindowCapturerWin to capture overlapping owned/pop-up windows (e.g. menus, dialogs, tooltips). This makes window capture behavior more consistent regardless of whether CroppingWindowCapturerWin is used & its conditions for using crop-from- screen capture are met (in ShouldUseScreenCapturer). (I.e. regardless of OS version, window shape / translucency, occlusion by another potentially top-most window, or whether the capturing app has opted in to using the cropping capturer). Owned/pop-up windows associated with the selected window are enumerated then captured individually, with their contents composited into the final frame. This change also: - Crops out the top window border (which exposed a bit of the background when using the cropping capturer, and resulted in an inconsistent appearance compared to the side & bottom borders being cropped out). Bug: chromium:980864 Change-Id: I81c504848a0c0e6bf122aeff437b400e44944718 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/148302 Commit-Queue: Jamie Walch <jamiewalch@chromium.org> Reviewed-by: Jamie Walch <jamiewalch@chromium.org> Cr-Commit-Position: refs/heads/master@{#28922}
79 lines
2.1 KiB
C++
79 lines
2.1 KiB
C++
/*
|
|
* Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "modules/desktop_capture/desktop_geometry.h"
|
|
|
|
#include <algorithm>
|
|
#include <cmath>
|
|
|
|
namespace webrtc {
|
|
|
|
bool DesktopRect::Contains(const DesktopVector& point) const {
|
|
return point.x() >= left() && point.x() < right() && point.y() >= top() &&
|
|
point.y() < bottom();
|
|
}
|
|
|
|
bool DesktopRect::ContainsRect(const DesktopRect& rect) const {
|
|
return rect.left() >= left() && rect.right() <= right() &&
|
|
rect.top() >= top() && rect.bottom() <= bottom();
|
|
}
|
|
|
|
void DesktopRect::IntersectWith(const DesktopRect& rect) {
|
|
left_ = std::max(left(), rect.left());
|
|
top_ = std::max(top(), rect.top());
|
|
right_ = std::min(right(), rect.right());
|
|
bottom_ = std::min(bottom(), rect.bottom());
|
|
if (is_empty()) {
|
|
left_ = 0;
|
|
top_ = 0;
|
|
right_ = 0;
|
|
bottom_ = 0;
|
|
}
|
|
}
|
|
|
|
void DesktopRect::UnionWith(const DesktopRect& rect) {
|
|
if (is_empty()) {
|
|
*this = rect;
|
|
return;
|
|
}
|
|
|
|
if (rect.is_empty()) {
|
|
return;
|
|
}
|
|
|
|
left_ = std::min(left(), rect.left());
|
|
top_ = std::min(top(), rect.top());
|
|
right_ = std::max(right(), rect.right());
|
|
bottom_ = std::max(bottom(), rect.bottom());
|
|
}
|
|
|
|
void DesktopRect::Translate(int32_t dx, int32_t dy) {
|
|
left_ += dx;
|
|
top_ += dy;
|
|
right_ += dx;
|
|
bottom_ += dy;
|
|
}
|
|
|
|
void DesktopRect::Extend(int32_t left_offset,
|
|
int32_t top_offset,
|
|
int32_t right_offset,
|
|
int32_t bottom_offset) {
|
|
left_ -= left_offset;
|
|
top_ -= top_offset;
|
|
right_ += right_offset;
|
|
bottom_ += bottom_offset;
|
|
}
|
|
|
|
void DesktopRect::Scale(double horizontal, double vertical) {
|
|
right_ += static_cast<int>(std::round(width() * (horizontal - 1)));
|
|
bottom_ += static_cast<int>(std::round(height() * (vertical - 1)));
|
|
}
|
|
|
|
} // namespace webrtc
|