061d89877a
To maintain interoperability between different capturer implementations this change updates WgcScreenSourceEnumerator to return a list of device indices instead of a list of HMONITORs, and WgcScreenSource to accept a device index as the input SourceId. WGC still requires an HMONITOR to create the capture item, so this change also adds a utility function GetHmonitorFromDeviceIndex to convert them, as well as new tests to cover these changes. Bug: webrtc:12663 Change-Id: Ic29faa0f023ebc26b4276cf29ef3d15d976e8615 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/214600 Commit-Queue: Austin Orion <auorion@microsoft.com> Reviewed-by: Jamie Walch <jamiewalch@chromium.org> Cr-Commit-Position: refs/heads/master@{#33673}
60 lines
1.8 KiB
C++
60 lines
1.8 KiB
C++
/*
|
|
* Copyright (c) 2017 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/win/screen_capture_utils.h"
|
|
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "modules/desktop_capture/desktop_capture_types.h"
|
|
#include "modules/desktop_capture/desktop_capturer.h"
|
|
#include "rtc_base/logging.h"
|
|
#include "test/gtest.h"
|
|
|
|
namespace webrtc {
|
|
|
|
TEST(ScreenCaptureUtilsTest, GetScreenList) {
|
|
DesktopCapturer::SourceList screens;
|
|
std::vector<std::string> device_names;
|
|
|
|
ASSERT_TRUE(GetScreenList(&screens));
|
|
screens.clear();
|
|
ASSERT_TRUE(GetScreenList(&screens, &device_names));
|
|
|
|
ASSERT_EQ(screens.size(), device_names.size());
|
|
}
|
|
|
|
TEST(ScreenCaptureUtilsTest, DeviceIndexToHmonitor) {
|
|
DesktopCapturer::SourceList screens;
|
|
ASSERT_TRUE(GetScreenList(&screens));
|
|
if (screens.size() == 0) {
|
|
RTC_LOG(LS_INFO) << "Skip screen capture test on systems with no monitors.";
|
|
GTEST_SKIP();
|
|
}
|
|
|
|
HMONITOR hmonitor;
|
|
ASSERT_TRUE(GetHmonitorFromDeviceIndex(screens[0].id, &hmonitor));
|
|
ASSERT_TRUE(IsMonitorValid(hmonitor));
|
|
}
|
|
|
|
TEST(ScreenCaptureUtilsTest, FullScreenDeviceIndexToHmonitor) {
|
|
HMONITOR hmonitor;
|
|
ASSERT_TRUE(GetHmonitorFromDeviceIndex(kFullDesktopScreenId, &hmonitor));
|
|
ASSERT_EQ(hmonitor, static_cast<HMONITOR>(0));
|
|
ASSERT_TRUE(IsMonitorValid(hmonitor));
|
|
}
|
|
|
|
TEST(ScreenCaptureUtilsTest, InvalidDeviceIndexToHmonitor) {
|
|
HMONITOR hmonitor;
|
|
ASSERT_FALSE(GetHmonitorFromDeviceIndex(kInvalidScreenId, &hmonitor));
|
|
}
|
|
|
|
} // namespace webrtc
|