ef77ef3573
This reverts commit d1208c26b1cdb536fdec942207033711101d5d26. Reason for revert: This cl causes the crashing issue as in chromium:916961 at starting desktop capture on Windows. Original change's description: > Desktop capturer: Add OnDisplayChanged callback > > This adds support for a new DesktopCapturer::Callback method > OnDisplayChanged that is sent at the start of a desktop capture > session and whenever the display geometry changes. > > This cl adds the basic structure to call this api at the start > of the capture session. Currently Windows only. > > A follow-up cl will add support to call this whenever the display > geometry changes. > > Bug: webrtc:10122, chromium:915411 > Change-Id: Ie7283be5992454180daab1a60f58a3b2efdfed56 > Reviewed-on: https://webrtc-review.googlesource.com/c/114020 > Commit-Queue: Gary Kacmarcik <garykac@chromium.org> > Reviewed-by: Brave Yao <braveyao@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#26053} TBR=jamiewalch@chromium.org,braveyao@webrtc.org,braveyao@chromium.org,garykac@chromium.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:10122, chromium:915411, chromium:916961 Change-Id: Id0471e01bb90bb5accdf58262ae2b130cf343ecd Reviewed-on: https://webrtc-review.googlesource.com/c/115433 Commit-Queue: Brave Yao <braveyao@webrtc.org> Reviewed-by: Brave Yao <braveyao@webrtc.org> Cr-Commit-Position: refs/heads/master@{#26095}
48 lines
2.0 KiB
C++
48 lines
2.0 KiB
C++
/*
|
|
* Copyright (c) 2014 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_WIN_SCREEN_CAPTURE_UTILS_H_
|
|
#define MODULES_DESKTOP_CAPTURE_WIN_SCREEN_CAPTURE_UTILS_H_
|
|
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "modules/desktop_capture/desktop_capturer.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// Output the list of active screens into |screens|. Returns true if succeeded,
|
|
// or false if it fails to enumerate the display devices. If the |device_names|
|
|
// is provided, it will be filled with the DISPLAY_DEVICE.DeviceName in UTF-8
|
|
// encoding. If this function returns true, consumers can always assume that
|
|
// |screens|[i] and |device_names|[i] indicate the same monitor on the system.
|
|
bool GetScreenList(DesktopCapturer::SourceList* screens,
|
|
std::vector<std::string>* device_names = nullptr);
|
|
|
|
// Returns true if |screen| is a valid screen. The screen device key is
|
|
// returned through |device_key| if the screen is valid. The device key can be
|
|
// used in GetScreenRect to verify the screen matches the previously obtained
|
|
// id.
|
|
bool IsScreenValid(DesktopCapturer::SourceId screen, std::wstring* device_key);
|
|
|
|
// Get the rect of the entire system in system coordinate system. I.e. the
|
|
// primary monitor always starts from (0, 0).
|
|
DesktopRect GetFullscreenRect();
|
|
|
|
// Get the rect of the screen identified by |screen|, relative to the primary
|
|
// display's top-left. If the screen device key does not match |device_key|, or
|
|
// the screen does not exist, or any error happens, an empty rect is returned.
|
|
DesktopRect GetScreenRect(DesktopCapturer::SourceId screen,
|
|
const std::wstring& device_key);
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_DESKTOP_CAPTURE_WIN_SCREEN_CAPTURE_UTILS_H_
|