Files
platform-external-webrtc/modules/desktop_capture/desktop_geometry.h
Henrik Boström 5bd8cb74a6 Revert "Reland "Implemented screen enumeration and selection for desktop capture under X11 using the X Resize and Rotate extension version 1.5.""
This reverts commit a0adf3d4409036d095480e9bfa0fc06990362f84.

Reason for revert: Suspected of breaking chromium trybots, blocking
webrtc from rolling into chromium.

- First failed roll:
https://chromium-review.googlesource.com/c/chromium/src/+/1889997

- Second failed roll:
https://chromium-review.googlesource.com/c/chromium/src/+/1890837

Example failure:
https://ci.chromium.org/p/chromium/builders/try/linux-rel/230122
Log:
https://logs.chromium.org/logs/chromium/buildbucket/cr-buildbucket.appspot.com/8898155661969383856/+/steps/browser_tests__with_patch_/0/logs/Deterministic_failure:_DesktopCaptureApiTest.ChooseDesktopMedia__status_FAILURE_/0

Including lines like:
[12413:12413:1030/102514.183135:INFO:CONSOLE(0)] "[FAIL] screenShareWithAudioPermissionGetStream: NotReadableError: Could not start video source
Error", source: chrome-extension://knldjmfmopnpolahpmmgbagdohdnhkik/_generated_background_page.html (0)

Original change's description:
> Reland "Implemented screen enumeration and selection for desktop capture under X11 using the X Resize and Rotate extension version 1.5."
> 
> This is a reland of e7153012682ccd3d1eacc18f802cab7820e3bad3
> 
> Original change's description:
> > Implemented screen enumeration and selection for desktop capture under X11 using the X Resize and Rotate entension version 1.5.
> >
> > Bug: chromium:396091
> > Change-Id: Ia1b36c771632c536bb8d15322461b479fabc409e
> > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/148768
> > Commit-Queue: Sergey Ulanov <sergeyu@chromium.org>
> > Reviewed-by: Sergey Ulanov <sergeyu@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#29083}
> 
> Bug: chromium:396091
> Change-Id: I0d9171ae5f340e0489e4b45ce5d97bc52b0a4904
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/156067
> Commit-Queue: Tommi <tommi@webrtc.org>
> Reviewed-by: Tommi <tommi@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#29655}

TBR=zijiehe@chromium.org,tommi@webrtc.org,julien.isorce@chromium.org,sergeyu@chromium.org,trevor.axiom@gmail.com,jonringle@gmail.com

Change-Id: I2af6a0d5eaf74a0ee536d1c5440049a21d6f7dbf
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: chromium:396091
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/158740
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Commit-Queue: Henrik Boström <hbos@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29658}
2019-10-30 18:14:52 +00:00

168 lines
5.3 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.
*/
#ifndef MODULES_DESKTOP_CAPTURE_DESKTOP_GEOMETRY_H_
#define MODULES_DESKTOP_CAPTURE_DESKTOP_GEOMETRY_H_
#include <stdint.h>
#include "rtc_base/system/rtc_export.h"
namespace webrtc {
// A vector in the 2D integer space. E.g. can be used to represent screen DPI.
class DesktopVector {
public:
DesktopVector() : x_(0), y_(0) {}
DesktopVector(int32_t x, int32_t y) : x_(x), y_(y) {}
int32_t x() const { return x_; }
int32_t y() const { return y_; }
bool is_zero() const { return x_ == 0 && y_ == 0; }
bool equals(const DesktopVector& other) const {
return x_ == other.x_ && y_ == other.y_;
}
void set(int32_t x, int32_t y) {
x_ = x;
y_ = y;
}
DesktopVector add(const DesktopVector& other) const {
return DesktopVector(x() + other.x(), y() + other.y());
}
DesktopVector subtract(const DesktopVector& other) const {
return DesktopVector(x() - other.x(), y() - other.y());
}
private:
int32_t x_;
int32_t y_;
};
// Type used to represent screen/window size.
class DesktopSize {
public:
DesktopSize() : width_(0), height_(0) {}
DesktopSize(int32_t width, int32_t height) : width_(width), height_(height) {}
int32_t width() const { return width_; }
int32_t height() const { return height_; }
bool is_empty() const { return width_ <= 0 || height_ <= 0; }
bool equals(const DesktopSize& other) const {
return width_ == other.width_ && height_ == other.height_;
}
void set(int32_t width, int32_t height) {
width_ = width;
height_ = height;
}
private:
int32_t width_;
int32_t height_;
};
// Represents a rectangle on the screen.
class RTC_EXPORT DesktopRect {
public:
static DesktopRect MakeSize(const DesktopSize& size) {
return DesktopRect(0, 0, size.width(), size.height());
}
static DesktopRect MakeWH(int32_t width, int32_t height) {
return DesktopRect(0, 0, width, height);
}
static DesktopRect MakeXYWH(int32_t x,
int32_t y,
int32_t width,
int32_t height) {
return DesktopRect(x, y, x + width, y + height);
}
static DesktopRect MakeLTRB(int32_t left,
int32_t top,
int32_t right,
int32_t bottom) {
return DesktopRect(left, top, right, bottom);
}
static DesktopRect MakeOriginSize(const DesktopVector& origin,
const DesktopSize& size) {
return MakeXYWH(origin.x(), origin.y(), size.width(), size.height());
}
DesktopRect() : left_(0), top_(0), right_(0), bottom_(0) {}
int32_t left() const { return left_; }
int32_t top() const { return top_; }
int32_t right() const { return right_; }
int32_t bottom() const { return bottom_; }
int32_t width() const { return right_ - left_; }
int32_t height() const { return bottom_ - top_; }
void set_width(int32_t width) { right_ = left_ + width; }
void set_height(int32_t height) { bottom_ = top_ + height; }
DesktopVector top_left() const { return DesktopVector(left_, top_); }
DesktopSize size() const { return DesktopSize(width(), height()); }
bool is_empty() const { return left_ >= right_ || top_ >= bottom_; }
bool equals(const DesktopRect& other) const {
return left_ == other.left_ && top_ == other.top_ &&
right_ == other.right_ && bottom_ == other.bottom_;
}
// Returns true if |point| lies within the rectangle boundaries.
bool Contains(const DesktopVector& point) const;
// Returns true if |rect| lies within the boundaries of this rectangle.
bool ContainsRect(const DesktopRect& rect) const;
// Finds intersection with |rect|.
void IntersectWith(const DesktopRect& rect);
// Extends the rectangle to cover |rect|. If |this| is empty, replaces |this|
// with |rect|; if |rect| is empty, this function takes no effect.
void UnionWith(const DesktopRect& rect);
// Adds (dx, dy) to the position of the rectangle.
void Translate(int32_t dx, int32_t dy);
void Translate(DesktopVector d) { Translate(d.x(), d.y()); }
// Enlarges current DesktopRect by subtracting |left_offset| and |top_offset|
// from |left_| and |top_|, and adding |right_offset| and |bottom_offset| to
// |right_| and |bottom_|. This function does not normalize the result, so
// |left_| and |top_| may be less than zero or larger than |right_| and
// |bottom_|.
void Extend(int32_t left_offset,
int32_t top_offset,
int32_t right_offset,
int32_t bottom_offset);
// Scales current DesktopRect. This function does not impact the |top_| and
// |left_|.
void Scale(double horizontal, double vertical);
private:
DesktopRect(int32_t left, int32_t top, int32_t right, int32_t bottom)
: left_(left), top_(top), right_(right), bottom_(bottom) {}
int32_t left_;
int32_t top_;
int32_t right_;
int32_t bottom_;
};
} // namespace webrtc
#endif // MODULES_DESKTOP_CAPTURE_DESKTOP_GEOMETRY_H_