generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

(Auto)update libjingle 72820109-> 72822008

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6850 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
buildbot@webrtc.org
2014-08-07 17:18:00 +00:00
parent d509678a4e
commit 5b1ebacca2
17 changed files with 257 additions and 442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
talk/media/devices/devicemanager_unittest.cc
View File

@@ -33,12 +33,6 @@
#endif
#include <string>
#include "talk/media/base/fakevideocapturer.h"
#include "talk/media/base/screencastid.h"
#include "talk/media/base/testutils.h"
#include "talk/media/base/videocapturerfactory.h"
#include "talk/media/devices/filevideocapturer.h"
#include "talk/media/devices/v4llookup.h"
#include "webrtc/base/fileutils.h"
#include "webrtc/base/gunit.h"
#include "webrtc/base/logging.h"
@@ -46,6 +40,10 @@
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/base/stream.h"
#include "webrtc/base/windowpickerfactory.h"
#include "talk/media/base/fakevideocapturer.h"
#include "talk/media/base/testutils.h"
#include "talk/media/devices/filevideocapturer.h"
#include "talk/media/devices/v4llookup.h"
#ifdef LINUX
// TODO(juberti): Figure out why this doesn't compile on Windows.
@@ -67,38 +65,24 @@ const cricket::VideoFormat kHdFormat(1280, 720,
cricket::VideoFormat::FpsToInterval(30),
cricket::FOURCC_I420);
class FakeVideoDeviceCapturerFactory :
public cricket::VideoDeviceCapturerFactory {
class FakeVideoCapturerFactory : public cricket::VideoCapturerFactory {
public:
FakeVideoDeviceCapturerFactory() {}
virtual ~FakeVideoDeviceCapturerFactory() {}
FakeVideoCapturerFactory() {}
virtual ~FakeVideoCapturerFactory() {}
virtual cricket::VideoCapturer* Create(const cricket::Device& device) {
return new cricket::FakeVideoCapturer;
}
};
class FakeScreenCapturerFactory : public cricket::ScreenCapturerFactory {
public:
FakeScreenCapturerFactory() {}
virtual ~FakeScreenCapturerFactory() {}
virtual cricket::VideoCapturer* Create(
const cricket::ScreencastId& screenid) {
return new cricket::FakeVideoCapturer;
}
};
class DeviceManagerTestFake : public testing::Test {
public:
virtual void SetUp() {
dm_.reset(DeviceManagerFactory::Create());
EXPECT_TRUE(dm_->Init());
DeviceManager* device_manager = static_cast<DeviceManager*>(dm_.get());
device_manager->SetVideoDeviceCapturerFactory(
new FakeVideoDeviceCapturerFactory());
device_manager->SetScreenCapturerFactory(
new FakeScreenCapturerFactory());
device_manager->set_device_video_capturer_factory(
new FakeVideoCapturerFactory());
}
virtual void TearDown() {
@@ -387,7 +371,6 @@ TEST(DeviceManagerTest, GetWindows) {
return;
}
scoped_ptr<DeviceManagerInterface> dm(DeviceManagerFactory::Create());
dm->SetScreenCapturerFactory(new FakeScreenCapturerFactory());
std::vector<rtc::WindowDescription> descriptions;
EXPECT_TRUE(dm->Init());
if (!dm->GetWindows(&descriptions) || descriptions.empty()) {
@@ -395,8 +378,8 @@ TEST(DeviceManagerTest, GetWindows) {
<< "windows to capture.";
return;
}
scoped_ptr<cricket::VideoCapturer> capturer(dm->CreateScreenCapturer(
cricket::ScreencastId(descriptions.front().id())));
scoped_ptr<cricket::VideoCapturer> capturer(dm->CreateWindowCapturer(
descriptions.front().id()));
EXPECT_FALSE(capturer.get() == NULL);
// TODO(hellner): creating a window capturer and immediately deleting it
// results in "Continuous Build and Test Mainline - Mac opt" failure (crash).
@@ -411,7 +394,6 @@ TEST(DeviceManagerTest, GetDesktops) {
return;
}
scoped_ptr<DeviceManagerInterface> dm(DeviceManagerFactory::Create());
dm->SetScreenCapturerFactory(new FakeScreenCapturerFactory());
std::vector<rtc::DesktopDescription> descriptions;
EXPECT_TRUE(dm->Init());
if (!dm->GetDesktops(&descriptions) || descriptions.empty()) {
@@ -419,8 +401,8 @@ TEST(DeviceManagerTest, GetDesktops) {
<< "desktops to capture.";
return;
}
scoped_ptr<cricket::VideoCapturer> capturer(dm->CreateScreenCapturer(
cricket::ScreencastId(descriptions.front().id())));
scoped_ptr<cricket::VideoCapturer> capturer(dm->CreateDesktopCapturer(
descriptions.front().id()));
EXPECT_FALSE(capturer.get() == NULL);
}
#endif // !WIN32