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

Adds display_id field to DesktopCapturer.

Browse Source 
The display_id field will be used in
https://chromium-review.googlesource.com/c/chromium/src/+/4020313.

Bug: chromium:1358949
Change-Id: I57b445e0a0fca540a2f3a5941238aee2cd995005
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/282960
Reviewed-by: Elad Alon <eladalon@webrtc.org>
Reviewed-by: Tony Herre <herre@google.com>
Reviewed-by: Henrik Andreassson <henrika@webrtc.org>
Commit-Queue: Simon Hangl <simonha@google.com>
Cr-Commit-Position: refs/heads/main@{#38617}
This commit is contained in:
Simon Hangl
2022-11-10 15:06:39 +01:00
committed by WebRTC LUCI CQ
parent 1bef09708a
commit cdc769dd76
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/desktop_capture/desktop_capture_types.h
View File

@ -25,6 +25,8 @@ typedef intptr_t WindowId;
const WindowId kNullWindowId = 0; const WindowId kNullWindowId = 0;
const int64_t kInvalidDisplayId = -1;
// Type used to identify screens on the desktop. Values are platform-specific: // Type used to identify screens on the desktop. Values are platform-specific:
// - On Windows: integer display device index. // - On Windows: integer display device index.
// - On OSX: CGDirectDisplayID cast to intptr_t. // - On OSX: CGDirectDisplayID cast to intptr_t.
@ -33,9 +35,9 @@ const WindowId kNullWindowId = 0;
// On Windows, ScreenId is implementation dependent: sending a ScreenId from one // On Windows, ScreenId is implementation dependent: sending a ScreenId from one
// implementation to another usually won't work correctly. // implementation to another usually won't work correctly.
#if defined(CHROMEOS) #if defined(CHROMEOS)
typedef int64_t ScreenId; typedef int64_t ScreenId;
#else #else
typedef intptr_t ScreenId; typedef intptr_t ScreenId;
#endif #endif
// The screen id corresponds to all screen combined together. // The screen id corresponds to all screen combined together.

4
modules/desktop_capture/desktop_capturer.h
View File

@ -86,6 +86,10 @@ class RTC_EXPORT DesktopCapturer {
// TODO(https://crbug.com/1369162): Remove or refactor this value. // TODO(https://crbug.com/1369162): Remove or refactor this value.
WindowId in_process_id = kNullWindowId; WindowId in_process_id = kNullWindowId;
#endif #endif
// The display's unique ID. If no ID is defined, it will hold the value
// kInvalidDisplayId.
int64_t display_id = kInvalidDisplayId;
}; };
typedef std::vector<Source> SourceList; typedef std::vector<Source> SourceList;