zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Implemented screen enumeration and selection for desktop capture under X11 using the X Resize and Rotate entension version 1.5."

Browse Source 
This reverts commit e7153012682ccd3d1eacc18f802cab7820e3bad3.

Reason for revert: Suspect of breaking build on linux_rel Chromium bot, preventing rolls into Chromium.

Sample log message:

FAILED: deb_chrome.deps 
python ../../chrome/installer/linux/debian/calculate_package_deps.py chrome ../../build/linux/debian_sid_amd64-sysroot x64 deb_chrome.deps --distro-check
Dependency libxrandr2 (>= 2:1.5.0) not satisfiable on distro Debian 8 (Jessie) caused by binary chrome
[71411/71430] LINK ./browser_tests
[71412/71430] LINK ./unit_tests
ninja: build stopped: subcommand failed.

Sample failed roll: https://chromium-review.googlesource.com/c/chromium/src/+/1788844

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}

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

Change-Id: I4a07213951a14eae524427c0a92d0cad72ade84c
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: chromium:396091
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/151761
Reviewed-by: Guido Urdaneta <guidou@webrtc.org>
Commit-Queue: Guido Urdaneta <guidou@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29088}
This commit is contained in:
Guido Urdaneta
2019-09-06 05:36:09 +00:00
committed by Commit Bot
parent c2accf2de5
commit ba5f8e94c8
6 changed files with 21 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -59,7 +59,6 @@ Silviu Caragea <silviu.cpp@gmail.com>
Stefan Gula <steweg@gmail.com>
Steve Reid <sreid@sea-to-sky.net>
Tarun Chawla <trnkumarchawla@gmail.com>
Trevor Hayes <trevor.axiom@gmail.com>
Uladzislau Susha <landby@gmail.com>
Vladimir Beloborodov <VladimirTechMan@gmail.com>
Vicken Simonian <vsimon@gmail.com>

1
modules/desktop_capture/BUILD.gn
View File

@ -411,7 +411,6 @@ rtc_static_library("desktop_capture_generic") {
"Xext",
"Xfixes",
"Xrender",
"Xrandr",
]
if (build_with_mozilla) {

2
modules/desktop_capture/desktop_geometry.h
View File

@ -43,8 +43,6 @@ class DesktopVector {
return DesktopVector(x() - other.x(), y() - other.y());
}
DesktopVector operator-() const { return DesktopVector(-x_, -y_); }
private:
int32_t x_;
int32_t y_;

145
modules/desktop_capture/linux/screen_capturer_x11.cc
View File

@ -46,10 +46,6 @@ ScreenCapturerX11::~ScreenCapturerX11() {
options_.x_display()->RemoveEventHandler(damage_event_base_ + XDamageNotify,
this);
}
if (use_randr_) {
options_.x_display()->RemoveEventHandler(
randr_event_base_ + RRScreenChangeNotify, this);
}
DeinitXlib();
}
@ -97,8 +93,6 @@ bool ScreenCapturerX11::Init(const DesktopCaptureOptions& options) {
InitXDamage();
}
InitXrandr();
return true;
}
@ -143,56 +137,6 @@ void ScreenCapturerX11::InitXDamage() {
RTC_LOG(LS_INFO) << "Using XDamage extension.";
}
void ScreenCapturerX11::InitXrandr() {
int major_version = 0;
int minor_version = 0;
int error_base_ignored = 0;
if (XRRQueryExtension(display(), &randr_event_base_, &error_base_ignored) &&
XRRQueryVersion(display(), &major_version, &minor_version)) {
if (major_version > 1 || (major_version == 1 && minor_version >= 5)) {
use_randr_ = true;
RTC_LOG(LS_INFO) << "Using XRandR extension v" << major_version << '.'
<< minor_version << '.';
monitors_ = XRRGetMonitors(display(), root_window_, true, &num_monitors_);
// Register for screen change notifications
XRRSelectInput(display(), root_window_, RRScreenChangeNotifyMask);
options_.x_display()->AddEventHandler(
randr_event_base_ + RRScreenChangeNotify, this);
} else {
RTC_LOG(LS_ERROR) << "XRandR entension is older than v1.5.";
}
} else {
RTC_LOG(LS_ERROR) << "X server does not support XRandR.";
}
}
void ScreenCapturerX11::UpdateMonitors() {
if (monitors_) {
XRRFreeMonitors(monitors_);
monitors_ = nullptr;
}
monitors_ = XRRGetMonitors(display(), root_window_, true, &num_monitors_);
if (selected_monitor_name_) {
for (int i = 0; i < num_monitors_; ++i) {
XRRMonitorInfo& m = monitors_[i];
if (selected_monitor_name_ == m.name) {
RTC_LOG(LS_INFO) << "XRandR monitor " << m.name << " rect updated.";
selected_monitor_rect_ =
DesktopRect::MakeXYWH(m.x, m.y, m.width, m.height);
return;
}
}
// The selected monitor is not connected anymore
RTC_LOG(LS_INFO) << "XRandR selected monitor " << selected_monitor_name_
<< " lost.";
selected_monitor_rect_ = DesktopRect::MakeWH(0, 0);
}
}
void ScreenCapturerX11::Start(Callback* callback) {
RTC_DCHECK(!callback_);
RTC_DCHECK(callback);
@ -224,13 +168,9 @@ void ScreenCapturerX11::CaptureFrame() {
// Note that we can't reallocate other buffers at this point, since the caller
// may still be reading from them.
if (!queue_.current_frame()) {
std::unique_ptr<DesktopFrame> frame(
new BasicDesktopFrame(selected_monitor_rect_.size()));
// We set the top-left of the frame so the mouse cursor will be composited
// properly, and our frame buffer will not be overrun while blitting.
frame->set_top_left(selected_monitor_rect_.top_left());
queue_.ReplaceCurrentFrame(SharedDesktopFrame::Wrap(std::move(frame)));
queue_.ReplaceCurrentFrame(
SharedDesktopFrame::Wrap(std::unique_ptr<DesktopFrame>(
new BasicDesktopFrame(x_server_pixel_buffer_.window_size()))));
}
std::unique_ptr<DesktopFrame> result = CaptureScreen();
@ -248,45 +188,14 @@ void ScreenCapturerX11::CaptureFrame() {
bool ScreenCapturerX11::GetSourceList(SourceList* sources) {
RTC_DCHECK(sources->size() == 0);
if (!use_randr_) {
sources->push_back({0});
return true;
}
// Ensure that |monitors_| is updated with changes that may have happened
// between calls to GetSourceList().
options_.x_display()->ProcessPendingXEvents();
for (int i = 0; i < num_monitors_; ++i) {
XRRMonitorInfo& m = monitors_[i];
char* monitor_title = XGetAtomName(display(), m.name);
// Note name is an X11 Atom used to id the monitor.
sources->push_back({static_cast<SourceId>(m.name), monitor_title});
XFree(monitor_title);
}
// TODO(jiayl): implement screen enumeration.
sources->push_back({0});
return true;
}
bool ScreenCapturerX11::SelectSource(SourceId id) {
if (!use_randr_) {
selected_monitor_rect_ =
DesktopRect::MakeSize(x_server_pixel_buffer_.window_size());
return true;
}
for (int i = 0; i < num_monitors_; ++i) {
if (id == static_cast<SourceId>(monitors_[i].name)) {
RTC_LOG(LS_INFO) << "XRandR selected source: " << id;
XRRMonitorInfo& m = monitors_[i];
selected_monitor_name_ = m.name;
selected_monitor_rect_ =
DesktopRect::MakeXYWH(m.x, m.y, m.width, m.height);
return true;
}
}
return false;
// TODO(jiayl): implement screen selection.
return true;
}
bool ScreenCapturerX11::HandleXEvent(const XEvent& event) {
@ -297,12 +206,6 @@ bool ScreenCapturerX11::HandleXEvent(const XEvent& event) {
return false;
RTC_DCHECK(damage_event->level == XDamageReportNonEmpty);
return true;
} else if (use_randr_ &&
event.type == randr_event_base_ + RRScreenChangeNotify) {
XRRUpdateConfiguration(const_cast<XEvent*>(&event));
UpdateMonitors();
RTC_LOG(LS_INFO) << "XRandR screen change event received.";
return true;
} else if (event.type == ConfigureNotify) {
ScreenConfigurationChanged();
return true;
@ -312,11 +215,11 @@ bool ScreenCapturerX11::HandleXEvent(const XEvent& event) {
std::unique_ptr<DesktopFrame> ScreenCapturerX11::CaptureScreen() {
std::unique_ptr<SharedDesktopFrame> frame = queue_.current_frame()->Share();
RTC_DCHECK(selected_monitor_rect_.size().equals(frame->size()));
RTC_DCHECK(x_server_pixel_buffer_.window_size().equals(frame->size()));
// Pass the screen size to the helper, so it can clip the invalid region if it
// expands that region to a grid.
helper_.set_size_most_recent(x_server_pixel_buffer_.window_size());
helper_.set_size_most_recent(frame->size());
// In the DAMAGE case, ensure the frame is up-to-date with the previous frame
// if any. If there isn't a previous frame, that means a screen-resolution
@ -344,7 +247,12 @@ std::unique_ptr<DesktopFrame> ScreenCapturerX11::CaptureScreen() {
// Capture the damaged portions of the desktop.
helper_.TakeInvalidRegion(updated_region);
updated_region->IntersectWith(selected_monitor_rect_);
// Clip the damaged portions to the current screen size, just in case some
// spurious XDamage notifications were received for a previous (larger)
// screen size.
updated_region->IntersectWith(
DesktopRect::MakeSize(x_server_pixel_buffer_.window_size()));
for (DesktopRegion::Iterator it(*updated_region); !it.IsAtEnd();
it.Advance()) {
@ -354,11 +262,10 @@ std::unique_ptr<DesktopFrame> ScreenCapturerX11::CaptureScreen() {
} else {
// Doing full-screen polling, or this is the first capture after a
// screen-resolution change. In either case, need a full-screen capture.
if (!x_server_pixel_buffer_.CaptureRect(selected_monitor_rect_,
frame.get())) {
DesktopRect screen_rect = DesktopRect::MakeSize(frame->size());
if (!x_server_pixel_buffer_.CaptureRect(screen_rect, frame.get()))
return nullptr;
}
updated_region->SetRect(selected_monitor_rect_);
updated_region->SetRect(screen_rect);
}
return std::move(frame);
@ -375,11 +282,6 @@ void ScreenCapturerX11::ScreenConfigurationChanged() {
RTC_LOG(LS_ERROR) << "Failed to initialize pixel buffer after screen "
"configuration change.";
}
if (!use_randr_) {
selected_monitor_rect_ =
DesktopRect::MakeSize(x_server_pixel_buffer_.window_size());
}
}
void ScreenCapturerX11::SynchronizeFrame() {
@ -398,20 +300,11 @@ void ScreenCapturerX11::SynchronizeFrame() {
RTC_DCHECK(current != last);
for (DesktopRegion::Iterator it(last_invalid_region_); !it.IsAtEnd();
it.Advance()) {
if (selected_monitor_rect_.ContainsRect(it.rect())) {
DesktopRect r = it.rect();
r.Translate(-selected_monitor_rect_.top_left());
current->CopyPixelsFrom(*last, r.top_left(), r);
}
current->CopyPixelsFrom(*last, it.rect().top_left(), it.rect());
}
}
void ScreenCapturerX11::DeinitXlib() {
if (monitors_) {
XRRFreeMonitors(monitors_);
monitors_ = nullptr;
}
if (gc_) {
XFreeGC(display(), gc_);
gc_ = nullptr;

11
modules/desktop_capture/linux/screen_capturer_x11.h
View File

@ -15,7 +15,6 @@
#include <X11/Xlib.h>
#include <X11/extensions/Xdamage.h>
#include <X11/extensions/Xfixes.h>
#include <X11/extensions/Xrandr.h>
#include <memory>
@ -65,8 +64,6 @@ class ScreenCapturerX11 : public DesktopCapturer,
bool HandleXEvent(const XEvent& event) override;
void InitXDamage();
void InitXrandr();
void UpdateMonitors();
// Capture screen pixels to the current buffer in the queue. In the DAMAGE
// case, the ScreenCapturerHelper already holds the list of invalid rectangles
@ -95,14 +92,6 @@ class ScreenCapturerX11 : public DesktopCapturer,
GC gc_ = nullptr;
Window root_window_ = BadValue;
// XRandR 1.5 monitors.
bool use_randr_ = false;
int randr_event_base_ = 0;
XRRMonitorInfo* monitors_ = nullptr;
int num_monitors_ = 0;
DesktopRect selected_monitor_rect_;
Atom selected_monitor_name_ = 0;
// XFixes.
bool has_xfixes_ = false;
int xfixes_event_base_ = -1;

12
modules/desktop_capture/linux/x_server_pixel_buffer.cc
View File

@ -66,12 +66,8 @@ void FastBlit(XImage* x_image,
uint8_t* src_pos,
const DesktopRect& rect,
DesktopFrame* frame) {
RTC_DCHECK_LE(frame->top_left().x(), rect.left());
RTC_DCHECK_LE(frame->top_left().y(), rect.top());
int src_stride = x_image->bytes_per_line;
int dst_x = rect.left() - frame->top_left().x();
int dst_y = rect.top() - frame->top_left().y();
int dst_x = rect.left(), dst_y = rect.top();
uint8_t* dst_pos = frame->data() + frame->stride() * dst_y;
dst_pos += dst_x * DesktopFrame::kBytesPerPixel;
@ -89,12 +85,8 @@ void SlowBlit(XImage* x_image,
uint8_t* src_pos,
const DesktopRect& rect,
DesktopFrame* frame) {
RTC_DCHECK_LE(frame->top_left().x(), rect.left());
RTC_DCHECK_LE(frame->top_left().y(), rect.top());
int src_stride = x_image->bytes_per_line;
int dst_x = rect.left() - frame->top_left().x();
int dst_y = rect.top() - frame->top_left().y();
int dst_x = rect.left(), dst_y = rect.top();
int width = rect.width(), height = rect.height();
uint32_t red_mask = x_image->red_mask;