admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove references of ScreenCapturer and WindowCapturer

Browse Source 
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}
This commit is contained in:
zijiehe 2016-11-09 16:37:48 -08:00 committed by Commit bot
parent 6bedebfb7a
commit 3045589e5f
6 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/modules/desktop_capture/cropping_window_capturer.cc
View File

@ -19,7 +19,7 @@ CroppingWindowCapturer::CroppingWindowCapturer(
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::SetSharedMemoryFactory(
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_);
}

4
webrtc/modules/desktop_capture/cropping_window_capturer.h
View File

@ -63,8 +63,8 @@ class CroppingWindowCapturer : public WindowCapturer,
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_;
};

4
webrtc/modules/desktop_capture/mouse_cursor_monitor_unittest.cc
View File

@ -87,8 +87,8 @@ TEST_F(MouseCursorMonitorTest, MAYBE(FromWindow)) {
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())

6
webrtc/modules/desktop_capture/screen_capturer_mac_unittest.cc
View File

@ -42,11 +42,11 @@ class ScreenCapturerMacTest : public testing::Test {
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_;
};

22
webrtc/modules/desktop_capture/screen_capturer_unittest.cc
View File

@ -34,18 +34,19 @@ namespace webrtc {
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 @@ class ScreenCapturerTest : public testing::Test {
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 @@ ACTION_P(SaveUniquePtrArg, dest) {
}
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));
}
}

6
webrtc/modules/desktop_capture/window_capturer_unittest.cc
View File

@ -24,8 +24,8 @@ class WindowCapturerTest : public testing::Test,
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 @@ class WindowCapturerTest : public testing::Test,
}
protected:
std::unique_ptr<WindowCapturer> capturer_;
std::unique_ptr<DesktopCapturer> capturer_;
std::unique_ptr<DesktopFrame> frame_;
};