Clang version changed 223108:230914
Details: e144d30..6fdb142/tools/clang/scripts/update.sh
Removes the OVERRIDE macro defined in:
* webrtc/base/common.h
* webrtc/typedefs.h
The majority of the source changes were done by running this in src/:
perl -0pi -e "s/virtual\s([^({;]*(\([^({;]*\)[^({;]*))(OVERRIDE|override)/\1override/sg" `find {talk,webrtc} -name "*.h" -o -name "*.cc*" -o -name "*.mm*"`
which converted all:
virtual Foo() OVERRIDE
functions to:
Foo() override
Then I manually edited:
* talk/media/webrtc/fakewebrtccommon.h
* webrtc/test/fake_common.h
Remaining uses of OVERRIDE was fixed by search+replace.
Manual edits were done to fix virtual destructors that were
overriding inherited ones.
Finally a build error related to the pure virtual definitions of
Read, Write and Rewind in common_types.h required a bit of
refactoring in:
* webrtc/common_types.cc
* webrtc/common_types.h
* webrtc/system_wrappers/interface/file_wrapper.h
* webrtc/system_wrappers/source/file_impl.cc
This roll should make it possible for us to finally re-enable deadlock
detection for TSan on the buildbots.
BUG=4106
R=pbos@webrtc.org, tommi@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/41069004
Cr-Commit-Position: refs/heads/master@{#8596}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8596 4adac7df-926f-26a2-2b94-8c16560cd09d
143 lines
4.1 KiB
C++
143 lines
4.1 KiB
C++
/*
|
|
* Copyright (c) 2013 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 "webrtc/modules/desktop_capture/screen_capturer.h"
|
|
|
|
#include "testing/gmock/include/gmock/gmock.h"
|
|
#include "testing/gtest/include/gtest/gtest.h"
|
|
#include "webrtc/modules/desktop_capture/desktop_capture_options.h"
|
|
#include "webrtc/modules/desktop_capture/desktop_frame.h"
|
|
#include "webrtc/modules/desktop_capture/desktop_region.h"
|
|
#include "webrtc/modules/desktop_capture/screen_capturer_mock_objects.h"
|
|
|
|
using ::testing::_;
|
|
using ::testing::AnyNumber;
|
|
using ::testing::Return;
|
|
using ::testing::SaveArg;
|
|
|
|
const int kTestSharedMemoryId = 123;
|
|
|
|
namespace webrtc {
|
|
|
|
class ScreenCapturerTest : public testing::Test {
|
|
public:
|
|
SharedMemory* CreateSharedMemory(size_t size);
|
|
|
|
void SetUp() override {
|
|
capturer_.reset(
|
|
ScreenCapturer::Create(DesktopCaptureOptions::CreateDefault()));
|
|
}
|
|
|
|
protected:
|
|
rtc::scoped_ptr<ScreenCapturer> capturer_;
|
|
MockScreenCapturerCallback callback_;
|
|
};
|
|
|
|
class FakeSharedMemory : public SharedMemory {
|
|
public:
|
|
FakeSharedMemory(char* buffer, size_t size)
|
|
: SharedMemory(buffer, size, 0, kTestSharedMemoryId),
|
|
buffer_(buffer) {
|
|
}
|
|
virtual ~FakeSharedMemory() {
|
|
delete[] buffer_;
|
|
}
|
|
private:
|
|
char* buffer_;
|
|
DISALLOW_COPY_AND_ASSIGN(FakeSharedMemory);
|
|
};
|
|
|
|
SharedMemory* ScreenCapturerTest::CreateSharedMemory(size_t size) {
|
|
return new FakeSharedMemory(new char[size], size);
|
|
}
|
|
|
|
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));
|
|
}
|
|
}
|
|
|
|
TEST_F(ScreenCapturerTest, StartCapturer) {
|
|
capturer_->Start(&callback_);
|
|
}
|
|
|
|
TEST_F(ScreenCapturerTest, Capture) {
|
|
// Assume that Start() treats the screen as invalid initially.
|
|
DesktopFrame* frame = NULL;
|
|
EXPECT_CALL(callback_, OnCaptureCompleted(_))
|
|
.WillOnce(SaveArg<0>(&frame));
|
|
|
|
EXPECT_CALL(callback_, CreateSharedMemory(_))
|
|
.Times(AnyNumber())
|
|
.WillRepeatedly(Return(static_cast<SharedMemory*>(NULL)));
|
|
|
|
capturer_->Start(&callback_);
|
|
capturer_->Capture(DesktopRegion());
|
|
|
|
ASSERT_TRUE(frame);
|
|
EXPECT_GT(frame->size().width(), 0);
|
|
EXPECT_GT(frame->size().height(), 0);
|
|
EXPECT_GE(frame->stride(),
|
|
frame->size().width() * DesktopFrame::kBytesPerPixel);
|
|
EXPECT_TRUE(frame->shared_memory() == NULL);
|
|
|
|
// Verify that the region contains whole screen.
|
|
EXPECT_FALSE(frame->updated_region().is_empty());
|
|
DesktopRegion::Iterator it(frame->updated_region());
|
|
ASSERT_TRUE(!it.IsAtEnd());
|
|
EXPECT_TRUE(it.rect().equals(DesktopRect::MakeSize(frame->size())));
|
|
it.Advance();
|
|
EXPECT_TRUE(it.IsAtEnd());
|
|
|
|
delete frame;
|
|
}
|
|
|
|
#if defined(WEBRTC_WIN)
|
|
|
|
TEST_F(ScreenCapturerTest, UseSharedBuffers) {
|
|
DesktopFrame* frame = NULL;
|
|
EXPECT_CALL(callback_, OnCaptureCompleted(_))
|
|
.WillOnce(SaveArg<0>(&frame));
|
|
|
|
EXPECT_CALL(callback_, CreateSharedMemory(_))
|
|
.Times(AnyNumber())
|
|
.WillRepeatedly(Invoke(this, &ScreenCapturerTest::CreateSharedMemory));
|
|
|
|
capturer_->Start(&callback_);
|
|
capturer_->Capture(DesktopRegion());
|
|
|
|
ASSERT_TRUE(frame);
|
|
ASSERT_TRUE(frame->shared_memory());
|
|
EXPECT_EQ(frame->shared_memory()->id(), kTestSharedMemoryId);
|
|
|
|
delete frame;
|
|
}
|
|
|
|
TEST_F(ScreenCapturerTest, UseMagnifier) {
|
|
DesktopCaptureOptions options(DesktopCaptureOptions::CreateDefault());
|
|
options.set_allow_use_magnification_api(true);
|
|
capturer_.reset(ScreenCapturer::Create(options));
|
|
|
|
DesktopFrame* frame = NULL;
|
|
EXPECT_CALL(callback_, OnCaptureCompleted(_)).WillOnce(SaveArg<0>(&frame));
|
|
|
|
capturer_->Start(&callback_);
|
|
capturer_->Capture(DesktopRegion());
|
|
ASSERT_TRUE(frame);
|
|
delete frame;
|
|
}
|
|
|
|
#endif // defined(WEBRTC_WIN)
|
|
|
|
} // namespace webrtc
|