Remove references of ScreenCapturer and WindowCapturer
This change removes references of ScreenCapturer and WindowCapturer from WebRTC.
So after this change, ScreenCapturer and WindowCapturer classes can be entirely
removed.
BUG=webrtc:6513
Review-Url: https://codereview.webrtc.org/2489943004
Cr-Commit-Position: refs/heads/master@{#15006}
diff --git a/webrtc/modules/desktop_capture/cropping_window_capturer.cc b/webrtc/modules/desktop_capture/cropping_window_capturer.cc
index 2968978..f0382c3 100644
--- a/webrtc/modules/desktop_capture/cropping_window_capturer.cc
+++ b/webrtc/modules/desktop_capture/cropping_window_capturer.cc
@@ -19,7 +19,7 @@
const DesktopCaptureOptions& options)
: options_(options),
callback_(NULL),
- window_capturer_(WindowCapturer::Create(options)),
+ window_capturer_(DesktopCapturer::CreateRawWindowCapturer(options)),
selected_window_(kNullWindowId),
excluded_window_(kNullWindowId) {
}
@@ -39,7 +39,7 @@
void CroppingWindowCapturer::CaptureFrame() {
if (ShouldUseScreenCapturer()) {
if (!screen_capturer_.get()) {
- screen_capturer_.reset(ScreenCapturer::Create(options_));
+ screen_capturer_ = DesktopCapturer::CreateRawScreenCapturer(options_);
if (excluded_window_) {
screen_capturer_->SetExcludedWindow(excluded_window_);
}
diff --git a/webrtc/modules/desktop_capture/cropping_window_capturer.h b/webrtc/modules/desktop_capture/cropping_window_capturer.h
index a2c6c2f..7986821 100644
--- a/webrtc/modules/desktop_capture/cropping_window_capturer.h
+++ b/webrtc/modules/desktop_capture/cropping_window_capturer.h
@@ -63,8 +63,8 @@
private:
DesktopCaptureOptions options_;
DesktopCapturer::Callback* callback_;
- std::unique_ptr<WindowCapturer> window_capturer_;
- std::unique_ptr<ScreenCapturer> screen_capturer_;
+ std::unique_ptr<DesktopCapturer> window_capturer_;
+ std::unique_ptr<DesktopCapturer> screen_capturer_;
SourceId selected_window_;
WindowId excluded_window_;
};
diff --git a/webrtc/modules/desktop_capture/mouse_cursor_monitor_unittest.cc b/webrtc/modules/desktop_capture/mouse_cursor_monitor_unittest.cc
index 59ad8e0..fcd870c 100644
--- a/webrtc/modules/desktop_capture/mouse_cursor_monitor_unittest.cc
+++ b/webrtc/modules/desktop_capture/mouse_cursor_monitor_unittest.cc
@@ -87,8 +87,8 @@
DesktopCaptureOptions options = DesktopCaptureOptions::CreateDefault();
// First get list of windows.
- std::unique_ptr<WindowCapturer> window_capturer(
- WindowCapturer::Create(options));
+ std::unique_ptr<DesktopCapturer> window_capturer(
+ DesktopCapturer::CreateWindowCapturer(options));
// If window capturing is not supported then skip this test.
if (!window_capturer.get())
diff --git a/webrtc/modules/desktop_capture/screen_capturer_mac_unittest.cc b/webrtc/modules/desktop_capture/screen_capturer_mac_unittest.cc
index e764492..47e512d 100644
--- a/webrtc/modules/desktop_capture/screen_capturer_mac_unittest.cc
+++ b/webrtc/modules/desktop_capture/screen_capturer_mac_unittest.cc
@@ -42,11 +42,11 @@
protected:
void SetUp() override {
- capturer_.reset(
- ScreenCapturer::Create(DesktopCaptureOptions::CreateDefault()));
+ capturer_ = DesktopCapturer::CreateScreenCapturer(
+ DesktopCaptureOptions::CreateDefault());
}
- std::unique_ptr<ScreenCapturer> capturer_;
+ std::unique_ptr<DesktopCapturer> capturer_;
MockScreenCapturerCallback callback_;
};
diff --git a/webrtc/modules/desktop_capture/screen_capturer_unittest.cc b/webrtc/modules/desktop_capture/screen_capturer_unittest.cc
index 41c08f0..df6ffb2 100644
--- a/webrtc/modules/desktop_capture/screen_capturer_unittest.cc
+++ b/webrtc/modules/desktop_capture/screen_capturer_unittest.cc
@@ -34,18 +34,19 @@
class ScreenCapturerTest : public testing::Test {
public:
void SetUp() override {
- capturer_.reset(
- ScreenCapturer::Create(DesktopCaptureOptions::CreateDefault()));
+ capturer_ = DesktopCapturer::CreateScreenCapturer(
+ DesktopCaptureOptions::CreateDefault());
}
protected:
#if defined(WEBRTC_WIN)
// Enable allow_directx_capturer in DesktopCaptureOptions, but let
- // ScreenCapturer::Create to decide whether a DirectX capturer should be used.
+ // DesktopCapturer::CreateScreenCapturer to decide whether a DirectX capturer
+ // should be used.
void MaybeCreateDirectxCapturer() {
DesktopCaptureOptions options(DesktopCaptureOptions::CreateDefault());
options.set_allow_directx_capturer(true);
- capturer_.reset(ScreenCapturer::Create(options));
+ capturer_ = DesktopCapturer::CreateScreenCapturer(options);
}
bool CreateDirectxCapturer() {
@@ -61,11 +62,11 @@
void CreateMagnifierCapturer() {
DesktopCaptureOptions options(DesktopCaptureOptions::CreateDefault());
options.set_allow_use_magnification_api(true);
- capturer_.reset(ScreenCapturer::Create(options));
+ capturer_ = DesktopCapturer::CreateScreenCapturer(options);
}
#endif // defined(WEBRTC_WIN)
- std::unique_ptr<ScreenCapturer> capturer_;
+ std::unique_ptr<DesktopCapturer> capturer_;
MockScreenCapturerCallback callback_;
};
@@ -102,11 +103,10 @@
}
TEST_F(ScreenCapturerTest, GetScreenListAndSelectScreen) {
- webrtc::ScreenCapturer::ScreenList screens;
- EXPECT_TRUE(capturer_->GetScreenList(&screens));
- for (webrtc::ScreenCapturer::ScreenList::iterator it = screens.begin();
- it != screens.end(); ++it) {
- EXPECT_TRUE(capturer_->SelectScreen(it->id));
+ webrtc::DesktopCapturer::SourceList screens;
+ EXPECT_TRUE(capturer_->GetSourceList(&screens));
+ for (const auto& screen : screens) {
+ EXPECT_TRUE(capturer_->SelectSource(screen.id));
}
}
diff --git a/webrtc/modules/desktop_capture/window_capturer_unittest.cc b/webrtc/modules/desktop_capture/window_capturer_unittest.cc
index e56a1de..7742fe4 100644
--- a/webrtc/modules/desktop_capture/window_capturer_unittest.cc
+++ b/webrtc/modules/desktop_capture/window_capturer_unittest.cc
@@ -24,8 +24,8 @@
public DesktopCapturer::Callback {
public:
void SetUp() override {
- capturer_.reset(
- WindowCapturer::Create(DesktopCaptureOptions::CreateDefault()));
+ capturer_ = DesktopCapturer::CreateWindowCapturer(
+ DesktopCaptureOptions::CreateDefault());
}
void TearDown() override {}
@@ -37,7 +37,7 @@
}
protected:
- std::unique_ptr<WindowCapturer> capturer_;
+ std::unique_ptr<DesktopCapturer> capturer_;
std::unique_ptr<DesktopFrame> frame_;
};