(Auto)update libjingle 72443101-> 72446860
git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@6815 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/libjingle.gyp b/libjingle.gyp
index 6064277..f14854c 100755
--- a/libjingle.gyp
+++ b/libjingle.gyp
@@ -480,8 +480,6 @@
'media/base/cpuid.cc',
'media/base/cpuid.h',
'media/base/cryptoparams.h',
- 'media/base/device.h',
- 'media/base/fakescreencapturerfactory.h',
'media/base/filemediaengine.cc',
'media/base/filemediaengine.h',
'media/base/hybriddataengine.h',
@@ -504,7 +502,6 @@
'media/base/videoadapter.h',
'media/base/videocapturer.cc',
'media/base/videocapturer.h',
- 'media/base/videocapturerfactory.h',
'media/base/videocommon.cc',
'media/base/videocommon.h',
'media/base/videoframe.cc',
@@ -536,8 +533,6 @@
'media/webrtc/webrtctexturevideoframe.cc',
'media/webrtc/webrtctexturevideoframe.h',
'media/webrtc/webrtcvideocapturer.cc',
- 'media/webrtc/webrtcvideocapturerfactory.h',
- 'media/webrtc/webrtcvideocapturerfactory.cc',
'media/webrtc/webrtcvideocapturer.h',
'media/webrtc/webrtcvideodecoderfactory.h',
'media/webrtc/webrtcvideoencoderfactory.h',
diff --git a/media/base/device.h b/media/base/device.h
deleted file mode 100755
index ced74c6..0000000
--- a/media/base/device.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// libjingle
-// Copyright 2014 Google Inc.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
-// and/or other materials provided with the distribution.
-// 3. The name of the author may not be used to endorse or promote products
-// derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef TALK_MEDIA_BASE_DEVICE_H_
-#define TALK_MEDIA_BASE_DEVICE_H_
-
-#include "webrtc/base/stringencode.h"
-
-namespace cricket {
-
-// Used to represent an audio or video capture or render device.
-struct Device {
- Device() {}
- Device(const std::string& name, int id)
- : name(name),
- id(rtc::ToString(id)) {
- }
- Device(const std::string& name, const std::string& id)
- : name(name), id(id) {}
-
- std::string name;
- std::string id;
-};
-
-} // namespace cricket
-
-#endif // TALK_MEDIA_BASE_DEVICE_H_
diff --git a/media/base/fakescreencapturerfactory.h b/media/base/fakescreencapturerfactory.h
deleted file mode 100755
index d9fccdc..0000000
--- a/media/base/fakescreencapturerfactory.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * libjingle
- * Copyright 2012 Google Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef TALK_MEDIA_BASE_FAKESCREENCAPTURERFACTORY_H_
-#define TALK_MEDIA_BASE_FAKESCREENCAPTURERFACTORY_H_
-
-#include "talk/media/base/fakevideocapturer.h"
-#include "talk/media/base/videocapturerfactory.h"
-
-namespace cricket {
-
-class FakeScreenCapturerFactory
- : public cricket::ScreenCapturerFactory,
- public sigslot::has_slots<> {
- public:
- FakeScreenCapturerFactory()
- : window_capturer_(NULL),
- capture_state_(cricket::CS_STOPPED) {}
-
- virtual cricket::VideoCapturer* Create(const ScreencastId& window) {
- if (window_capturer_ != NULL) {
- // Class is only designed to handle one fake screencapturer.
- ADD_FAILURE();
- return NULL;
- }
- window_capturer_ = new cricket::FakeVideoCapturer;
- window_capturer_->SignalDestroyed.connect(
- this,
- &FakeScreenCapturerFactory::OnWindowCapturerDestroyed);
- window_capturer_->SignalStateChange.connect(
- this,
- &FakeScreenCapturerFactory::OnStateChange);
- return window_capturer_;
- }
-
- cricket::FakeVideoCapturer* window_capturer() { return window_capturer_; }
-
- cricket::CaptureState capture_state() { return capture_state_; }
-
- private:
- void OnWindowCapturerDestroyed(cricket::FakeVideoCapturer* capturer) {
- if (capturer == window_capturer_) {
- window_capturer_ = NULL;
- }
- }
- void OnStateChange(cricket::VideoCapturer*, cricket::CaptureState state) {
- capture_state_ = state;
- }
-
- cricket::FakeVideoCapturer* window_capturer_;
- cricket::CaptureState capture_state_;
-};
-
-} // namespace cricket
-
-#endif // TALK_MEDIA_BASE_FAKESCREENCAPTURERFACTORY_H_
diff --git a/media/base/videocapturerfactory.h b/media/base/videocapturerfactory.h
deleted file mode 100755
index 009a5ee..0000000
--- a/media/base/videocapturerfactory.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// libjingle
-// Copyright 2014 Google Inc.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
-// and/or other materials provided with the distribution.
-// 3. The name of the author may not be used to endorse or promote products
-// derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef TALK_MEDIA_BASE_VIDEOCAPTURERFACTORY_H_
-#define TALK_MEDIA_BASE_VIDEOCAPTURERFACTORY_H_
-
-#include "talk/media/base/device.h"
-#include "talk/media/base/screencastid.h"
-
-namespace cricket {
-
-class VideoCapturer;
-
-class VideoDeviceCapturerFactory {
- public:
- VideoDeviceCapturerFactory() {}
- virtual ~VideoDeviceCapturerFactory() {}
-
- virtual VideoCapturer* Create(const Device& device) = 0;
-};
-
-class ScreenCapturerFactory {
- public:
- ScreenCapturerFactory() {}
- virtual ~ScreenCapturerFactory() {}
-
- virtual VideoCapturer* Create(const ScreencastId& screenid) = 0;
-};
-
-} // namespace cricket
-
-#endif // TALK_MEDIA_BASE_VIDEOCAPTURERFACTORY_H_
diff --git a/media/devices/devicemanager.cc b/media/devices/devicemanager.cc
index 9d7a951..c331adc 100644
--- a/media/devices/devicemanager.cc
+++ b/media/devices/devicemanager.cc
@@ -35,14 +35,19 @@
#include "webrtc/base/windowpicker.h"
#include "webrtc/base/windowpickerfactory.h"
#include "talk/media/base/mediacommon.h"
-#include "talk/media/base/videocapturerfactory.h"
#include "talk/media/devices/deviceinfo.h"
#include "talk/media/devices/filevideocapturer.h"
#include "talk/media/devices/yuvframescapturer.h"
-#ifdef HAVE_WEBRTC_VIDEO
-#include "talk/media/webrtc/webrtcvideocapturerfactory.h"
-#endif // HAVE_WEBRTC_VIDEO
+#if defined(HAVE_WEBRTC_VIDEO)
+#include "talk/media/webrtc/webrtcvideocapturer.h"
+#endif
+
+
+#if defined(HAVE_WEBRTC_VIDEO)
+#define VIDEO_CAPTURER_NAME WebRtcVideoCapturer
+#endif
+
namespace {
@@ -59,12 +64,29 @@
// Initialize to empty string.
const char DeviceManagerInterface::kDefaultDeviceName[] = "";
+class DefaultVideoCapturerFactory : public VideoCapturerFactory {
+ public:
+ DefaultVideoCapturerFactory() {}
+ virtual ~DefaultVideoCapturerFactory() {}
+
+ VideoCapturer* Create(const Device& device) {
+#if defined(VIDEO_CAPTURER_NAME)
+ VIDEO_CAPTURER_NAME* return_value = new VIDEO_CAPTURER_NAME;
+ if (!return_value->Init(device)) {
+ delete return_value;
+ return NULL;
+ }
+ return return_value;
+#else
+ return NULL;
+#endif
+ }
+};
+
DeviceManager::DeviceManager()
: initialized_(false),
+ device_video_capturer_factory_(new DefaultVideoCapturerFactory),
window_picker_(rtc::WindowPickerFactory::CreateWindowPicker()) {
-#ifdef HAVE_WEBRTC_VIDEO
- SetVideoDeviceCapturerFactory(new WebRtcVideoDeviceCapturerFactory());
-#endif // HAVE_WEBRTC_VIDEO
}
DeviceManager::~DeviceManager() {
@@ -190,16 +212,12 @@
}
VideoCapturer* DeviceManager::CreateVideoCapturer(const Device& device) const {
- VideoCapturer* capturer = MaybeConstructFakeVideoCapturer(device);
+ VideoCapturer* capturer = ConstructFakeVideoCapturer(device);
if (capturer) {
return capturer;
}
- if (!video_device_capturer_factory_) {
- LOG(LS_ERROR) << "No video capturer factory for devices.";
- return NULL;
- }
- capturer = video_device_capturer_factory_->Create(device);
+ capturer = device_video_capturer_factory_->Create(device);
if (!capturer) {
return NULL;
}
@@ -213,7 +231,7 @@
return capturer;
}
-VideoCapturer* DeviceManager::MaybeConstructFakeVideoCapturer(
+VideoCapturer* DeviceManager::ConstructFakeVideoCapturer(
const Device& device) const {
// TODO(hellner): Throw out the creation of a file video capturer once the
// refactoring is completed.
@@ -244,6 +262,19 @@
return window_picker_->GetWindowList(descriptions);
}
+VideoCapturer* DeviceManager::CreateWindowCapturer(rtc::WindowId window) {
+#if defined(WINDOW_CAPTURER_NAME)
+ WINDOW_CAPTURER_NAME* window_capturer = new WINDOW_CAPTURER_NAME();
+ if (!window_capturer->Init(window)) {
+ delete window_capturer;
+ return NULL;
+ }
+ return window_capturer;
+#else
+ return NULL;
+#endif
+}
+
bool DeviceManager::GetDesktops(
std::vector<rtc::DesktopDescription>* descriptions) {
if (!window_picker_) {
@@ -252,13 +283,18 @@
return window_picker_->GetDesktopList(descriptions);
}
-VideoCapturer* DeviceManager::CreateScreenCapturer(
- const ScreencastId& screenid) const {
- if (!screen_capturer_factory_) {
- LOG(LS_ERROR) << "No video capturer factory for screens.";
+VideoCapturer* DeviceManager::CreateDesktopCapturer(
+ rtc::DesktopId desktop) {
+#if defined(DESKTOP_CAPTURER_NAME)
+ DESKTOP_CAPTURER_NAME* desktop_capturer = new DESKTOP_CAPTURER_NAME();
+ if (!desktop_capturer->Init(desktop.index())) {
+ delete desktop_capturer;
return NULL;
}
- return screen_capturer_factory_->Create(screenid);
+ return desktop_capturer;
+#else
+ return NULL;
+#endif
}
bool DeviceManager::GetAudioDevices(bool input,
diff --git a/media/devices/devicemanager.h b/media/devices/devicemanager.h
index 74ceb38..0107348 100644
--- a/media/devices/devicemanager.h
+++ b/media/devices/devicemanager.h
@@ -32,14 +32,11 @@
#include <string>
#include <vector>
-#include "talk/media/base/device.h"
-#include "talk/media/base/screencastid.h"
-#include "talk/media/base/videocommon.h"
-#include "talk/media/base/videocapturerfactory.h"
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/base/sigslot.h"
#include "webrtc/base/stringencode.h"
#include "webrtc/base/window.h"
+#include "talk/media/base/videocommon.h"
namespace rtc {
@@ -52,6 +49,28 @@
class VideoCapturer;
+// Used to represent an audio or video capture or render device.
+struct Device {
+ Device() {}
+ Device(const std::string& first, int second)
+ : name(first),
+ id(rtc::ToString(second)) {
+ }
+ Device(const std::string& first, const std::string& second)
+ : name(first), id(second) {}
+
+ std::string name;
+ std::string id;
+};
+
+class VideoCapturerFactory {
+ public:
+ VideoCapturerFactory() {}
+ virtual ~VideoCapturerFactory() {}
+
+ virtual VideoCapturer* Create(const Device& device) = 0;
+};
+
// DeviceManagerInterface - interface to manage the audio and
// video devices on the system.
class DeviceManagerInterface {
@@ -75,14 +94,6 @@
virtual bool GetVideoCaptureDevices(std::vector<Device>* devs) = 0;
virtual bool GetVideoCaptureDevice(const std::string& name, Device* out) = 0;
- // If the device manager needs to create video capturers, here is
- // how to control which video capturers are created. These take
- // ownership of the factories.
- virtual void SetVideoDeviceCapturerFactory(
- VideoDeviceCapturerFactory* video_device_capturer_factory) = 0;
- virtual void SetScreenCapturerFactory(
- ScreenCapturerFactory* screen_capturer_factory) = 0;
-
// Caps the capture format according to max format for capturers created
// by CreateVideoCapturer(). See ConstrainSupportedFormats() in
// videocapturer.h for more detail.
@@ -98,10 +109,12 @@
virtual bool GetWindows(
std::vector<rtc::WindowDescription>* descriptions) = 0;
+ virtual VideoCapturer* CreateWindowCapturer(rtc::WindowId window) = 0;
+
virtual bool GetDesktops(
std::vector<rtc::DesktopDescription>* descriptions) = 0;
- virtual VideoCapturer* CreateScreenCapturer(
- const ScreencastId& screenid) const = 0;
+ virtual VideoCapturer* CreateDesktopCapturer(
+ rtc::DesktopId desktop) = 0;
sigslot::signal0<> SignalDevicesChange;
@@ -129,6 +142,11 @@
DeviceManager();
virtual ~DeviceManager();
+ void set_device_video_capturer_factory(
+ VideoCapturerFactory* device_video_capturer_factory) {
+ device_video_capturer_factory_.reset(device_video_capturer_factory);
+ }
+
// Initialization
virtual bool Init();
virtual void Terminate();
@@ -146,29 +164,19 @@
virtual bool GetVideoCaptureDevices(std::vector<Device>* devs);
virtual bool GetVideoCaptureDevice(const std::string& name, Device* out);
- virtual void SetVideoDeviceCapturerFactory(
- VideoDeviceCapturerFactory* video_device_capturer_factory) {
- video_device_capturer_factory_.reset(video_device_capturer_factory);
- }
- virtual void SetScreenCapturerFactory(
- ScreenCapturerFactory* screen_capturer_factory) {
- screen_capturer_factory_.reset(screen_capturer_factory);
- }
-
-
virtual void SetVideoCaptureDeviceMaxFormat(const std::string& usb_id,
const VideoFormat& max_format);
virtual void ClearVideoCaptureDeviceMaxFormat(const std::string& usb_id);
- // TODO(pthatcher): Rename to CreateVideoDeviceCapturer.
virtual VideoCapturer* CreateVideoCapturer(const Device& device) const;
virtual bool GetWindows(
std::vector<rtc::WindowDescription>* descriptions);
+ virtual VideoCapturer* CreateWindowCapturer(rtc::WindowId window);
+
virtual bool GetDesktops(
std::vector<rtc::DesktopDescription>* descriptions);
- virtual VideoCapturer* CreateScreenCapturer(
- const ScreencastId& screenid) const;
+ virtual VideoCapturer* CreateDesktopCapturer(rtc::DesktopId desktop);
// The exclusion_list MUST be a NULL terminated list.
static bool FilterDevices(std::vector<Device>* devices,
@@ -194,13 +202,10 @@
static bool ShouldDeviceBeIgnored(const std::string& device_name,
const char* const exclusion_list[]);
bool GetFakeVideoCaptureDevice(const std::string& name, Device* out) const;
- VideoCapturer* MaybeConstructFakeVideoCapturer(const Device& device) const;
+ VideoCapturer* ConstructFakeVideoCapturer(const Device& device) const;
bool initialized_;
- rtc::scoped_ptr<
- VideoDeviceCapturerFactory> video_device_capturer_factory_;
- rtc::scoped_ptr<
- ScreenCapturerFactory> screen_capturer_factory_;
+ rtc::scoped_ptr<VideoCapturerFactory> device_video_capturer_factory_;
std::map<std::string, VideoFormat> max_formats_;
rtc::scoped_ptr<DeviceWatcher> watcher_;
rtc::scoped_ptr<rtc::WindowPicker> window_picker_;
diff --git a/media/devices/devicemanager_unittest.cc b/media/devices/devicemanager_unittest.cc
index 19aaa90..3bc0241 100644
--- a/media/devices/devicemanager_unittest.cc
+++ b/media/devices/devicemanager_unittest.cc
@@ -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 @@
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 @@
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 @@
<< "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 @@
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 @@
<< "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
diff --git a/media/devices/fakedevicemanager.h b/media/devices/fakedevicemanager.h
index 7bc649d..5fc3715 100644
--- a/media/devices/fakedevicemanager.h
+++ b/media/devices/fakedevicemanager.h
@@ -31,11 +31,11 @@
#include <string>
#include <vector>
+#include "webrtc/base/window.h"
+#include "webrtc/base/windowpicker.h"
#include "talk/media/base/fakevideocapturer.h"
#include "talk/media/base/mediacommon.h"
#include "talk/media/devices/devicemanager.h"
-#include "webrtc/base/window.h"
-#include "webrtc/base/windowpicker.h"
namespace cricket {
@@ -79,12 +79,6 @@
*devs = vidcap_devices_;
return true;
}
- virtual void SetVideoDeviceCapturerFactory(
- VideoDeviceCapturerFactory* video_device_capturer_factory) {
- }
- virtual void SetScreenCapturerFactory(
- ScreenCapturerFactory* screen_capturer_factory) {
- }
virtual void SetVideoCaptureDeviceMaxFormat(const std::string& usb_id,
const VideoFormat& max_format) {
max_formats_[usb_id] = max_format;
@@ -103,10 +97,6 @@
virtual VideoCapturer* CreateVideoCapturer(const Device& device) const {
return new FakeVideoCapturer();
}
- virtual VideoCapturer* CreateScreenCapturer(
- const ScreencastId& screenid) const {
- return new FakeVideoCapturer();
- }
virtual bool GetWindows(
std::vector<rtc::WindowDescription>* descriptions) {
descriptions->clear();
diff --git a/media/webrtc/webrtcvideocapturerfactory.cc b/media/webrtc/webrtcvideocapturerfactory.cc
deleted file mode 100755
index 813a32b..0000000
--- a/media/webrtc/webrtcvideocapturerfactory.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * libjingle
- * Copyright 2014 Google Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "talk/media/webrtc/webrtcvideocapturer.h"
-#include "talk/media/webrtc/webrtcvideocapturerfactory.h"
-#include "webrtc/base/scoped_ptr.h"
-
-namespace cricket {
-
-VideoCapturer* WebRtcVideoDeviceCapturerFactory::Create(const Device& device) {
- talk_base::scoped_ptr<WebRtcVideoCapturer> capturer(
- new WebRtcVideoCapturer());
- if (!capturer->Init(device)) {
- return NULL;
- }
- return capturer.release();
-}
-
-} // namespace cricket
diff --git a/media/webrtc/webrtcvideocapturerfactory.h b/media/webrtc/webrtcvideocapturerfactory.h
deleted file mode 100755
index 091b072..0000000
--- a/media/webrtc/webrtcvideocapturerfactory.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// libjingle
-// Copyright 2014 Google Inc.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
-// and/or other materials provided with the distribution.
-// 3. The name of the author may not be used to endorse or promote products
-// derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-
-// TODO(pthatcher): Reneme file to match class name.
-#ifndef TALK_MEDIA_WEBRTC_WEBRTCVIDEOCAPTURERFACTORY_H_
-#define TALK_MEDIA_WEBRTC_WEBRTCVIDEOCAPTURERFACTORY_H_
-
-#include "talk/media/base/videocapturerfactory.h"
-
-namespace cricket {
-
-// Creates instances of cricket::WebRtcVideoCapturer.
-class WebRtcVideoDeviceCapturerFactory : public VideoDeviceCapturerFactory {
- public:
- virtual VideoCapturer* Create(const Device& device);
-};
-
-} // namespace cricket
-
-#endif // TALK_MEDIA_WEBRTC_WEBRTCVIDEOCAPTURERFACTORY_H_
diff --git a/session/media/call.cc b/session/media/call.cc
index ac02e7c..fc22eb4 100644
--- a/session/media/call.cc
+++ b/session/media/call.cc
@@ -493,7 +493,7 @@
bool Call::StartScreencast(Session* session,
const std::string& streamid, uint32 ssrc,
- const ScreencastId& screenid, int fps) {
+ const ScreencastId& screencastid, int fps) {
MediaSessionMap::iterator it = media_session_map_.find(session->id());
if (it == media_session_map_.end()) {
return false;
@@ -506,19 +506,12 @@
return false;
}
- VideoCapturer* capturer = session_client_->channel_manager()->
- CreateScreenCapturer(screenid);
- if (!capturer) {
+ VideoCapturer *capturer = video_channel->AddScreencast(ssrc, screencastid);
+ if (capturer == NULL) {
LOG(LS_WARNING) << "Could not create screencast capturer.";
return false;
}
- if (!video_channel->AddScreencast(ssrc, capturer)) {
- delete capturer;
- LOG(LS_WARNING) << "Could not add screencast capturer.";
- return false;
- }
-
VideoFormat format = ScreencastFormatFromFps(fps);
if (!session_client_->channel_manager()->StartVideoCapture(
capturer, format)) {
diff --git a/session/media/call.h b/session/media/call.h
index 3122f55..e61fec8 100644
--- a/session/media/call.h
+++ b/session/media/call.h
@@ -115,7 +115,7 @@
void PressDTMF(int event);
bool StartScreencast(Session* session,
const std::string& stream_name, uint32 ssrc,
- const ScreencastId& screenid, int fps);
+ const ScreencastId& screencastid, int fps);
bool StopScreencast(Session* session,
const std::string& stream_name, uint32 ssrc);
diff --git a/session/media/channel.cc b/session/media/channel.cc
index 3615da8..67bd2da 100644
--- a/session/media/channel.cc
+++ b/session/media/channel.cc
@@ -27,18 +27,19 @@
#include "talk/session/media/channel.h"
-#include "talk/media/base/constants.h"
-#include "talk/media/base/rtputils.h"
-#include "talk/p2p/base/transportchannel.h"
-#include "talk/session/media/channelmanager.h"
-#include "talk/session/media/mediamessages.h"
-#include "talk/session/media/typingmonitor.h"
#include "webrtc/base/bind.h"
#include "webrtc/base/buffer.h"
#include "webrtc/base/byteorder.h"
#include "webrtc/base/common.h"
#include "webrtc/base/dscp.h"
#include "webrtc/base/logging.h"
+#include "talk/media/base/constants.h"
+#include "talk/media/base/rtputils.h"
+#include "talk/p2p/base/transportchannel.h"
+#include "talk/session/media/channelmanager.h"
+#include "talk/session/media/mediamessages.h"
+#include "talk/session/media/typingmonitor.h"
+
namespace cricket {
@@ -72,6 +73,20 @@
}
}
+// TODO(hellner): use the device manager for creation of screen capturers when
+// the cl enabling it has landed.
+class NullScreenCapturerFactory : public VideoChannel::ScreenCapturerFactory {
+ public:
+ VideoCapturer* CreateScreenCapturer(const ScreencastId& window) {
+ return NULL;
+ }
+};
+
+
+VideoChannel::ScreenCapturerFactory* CreateScreenCapturerFactory() {
+ return new NullScreenCapturerFactory();
+}
+
struct PacketMessageData : public rtc::MessageData {
rtc::Buffer packet;
rtc::DiffServCodePoint dscp;
@@ -1659,6 +1674,7 @@
rtcp),
voice_channel_(voice_channel),
renderer_(NULL),
+ screencapture_factory_(CreateScreenCapturerFactory()),
previous_we_(rtc::WE_CLOSE) {
}
@@ -1713,9 +1729,10 @@
return InvokeOnWorker(Bind(&VideoChannel::ApplyViewRequest_w, this, request));
}
-bool VideoChannel::AddScreencast(uint32 ssrc, VideoCapturer* capturer) {
- return worker_thread()->Invoke<bool>(Bind(
- &VideoChannel::AddScreencast_w, this, ssrc, capturer));
+VideoCapturer* VideoChannel::AddScreencast(
+ uint32 ssrc, const ScreencastId& id) {
+ return worker_thread()->Invoke<VideoCapturer*>(Bind(
+ &VideoChannel::AddScreencast_w, this, ssrc, id));
}
bool VideoChannel::SetCapturer(uint32 ssrc, VideoCapturer* capturer) {
@@ -1757,6 +1774,13 @@
return true;
}
+void VideoChannel::SetScreenCaptureFactory(
+ ScreenCapturerFactory* screencapture_factory) {
+ worker_thread()->Invoke<void>(Bind(
+ &VideoChannel::SetScreenCaptureFactory_w,
+ this, screencapture_factory));
+}
+
void VideoChannel::ChangeState() {
// Render incoming data if we're the active call, and we have the local
// content. We receive data on the default channel and multiplexed streams.
@@ -1936,13 +1960,20 @@
return ret;
}
-bool VideoChannel::AddScreencast_w(uint32 ssrc, VideoCapturer* capturer) {
+VideoCapturer* VideoChannel::AddScreencast_w(
+ uint32 ssrc, const ScreencastId& id) {
if (screencast_capturers_.find(ssrc) != screencast_capturers_.end()) {
- return false;
+ return NULL;
}
- capturer->SignalStateChange.connect(this, &VideoChannel::OnStateChange);
- screencast_capturers_[ssrc] = capturer;
- return true;
+ VideoCapturer* screen_capturer =
+ screencapture_factory_->CreateScreenCapturer(id);
+ if (!screen_capturer) {
+ return NULL;
+ }
+ screen_capturer->SignalStateChange.connect(this,
+ &VideoChannel::OnStateChange);
+ screencast_capturers_[ssrc] = screen_capturer;
+ return screen_capturer;
}
bool VideoChannel::RemoveScreencast_w(uint32 ssrc) {
@@ -1972,6 +2003,15 @@
data->screencast_max_pixels = capturer->screencast_max_pixels();
}
+void VideoChannel::SetScreenCaptureFactory_w(
+ ScreenCapturerFactory* screencapture_factory) {
+ if (screencapture_factory == NULL) {
+ screencapture_factory_.reset(CreateScreenCapturerFactory());
+ } else {
+ screencapture_factory_.reset(screencapture_factory);
+ }
+}
+
void VideoChannel::OnScreencastWindowEvent_s(uint32 ssrc,
rtc::WindowEvent we) {
ASSERT(signaling_thread() == rtc::Thread::Current());
diff --git a/session/media/channel.h b/session/media/channel.h
index 4d3baf6..2480f45 100644
--- a/session/media/channel.h
+++ b/session/media/channel.h
@@ -38,6 +38,7 @@
#include "webrtc/base/window.h"
#include "talk/media/base/mediachannel.h"
#include "talk/media/base/mediaengine.h"
+#include "talk/media/base/screencastid.h"
#include "talk/media/base/streamparams.h"
#include "talk/media/base/videocapturer.h"
#include "talk/p2p/base/session.h"
@@ -507,6 +508,14 @@
// VideoChannel is a specialization for video.
class VideoChannel : public BaseChannel {
public:
+ // Make screen capturer virtual so that it can be overriden in testing.
+ // E.g. used to test that window events are triggered correctly.
+ class ScreenCapturerFactory {
+ public:
+ virtual VideoCapturer* CreateScreenCapturer(const ScreencastId& window) = 0;
+ virtual ~ScreenCapturerFactory() {}
+ };
+
VideoChannel(rtc::Thread* thread, MediaEngineInterface* media_engine,
VideoMediaChannel* channel, BaseSession* session,
const std::string& content_name, bool rtcp,
@@ -519,8 +528,7 @@
// TODO(pthatcher): Refactor to use a "capture id" instead of an
// ssrc here as the "key".
- // Passes ownership of the capturer to the channel.
- bool AddScreencast(uint32 ssrc, VideoCapturer* capturer);
+ VideoCapturer* AddScreencast(uint32 ssrc, const ScreencastId& id);
bool SetCapturer(uint32 ssrc, VideoCapturer* capturer);
bool RemoveScreencast(uint32 ssrc);
// True if we've added a screencast. Doesn't matter if the capturer
@@ -544,6 +552,9 @@
sigslot::signal3<VideoChannel*, uint32, VideoMediaChannel::Error>
SignalMediaError;
+ void SetScreenCaptureFactory(
+ ScreenCapturerFactory* screencapture_factory);
+
// Configuration and setting.
bool SetChannelOptions(const VideoOptions& options);
@@ -568,11 +579,13 @@
std::string* error_desc);
bool ApplyViewRequest_w(const ViewRequest& request);
- bool AddScreencast_w(uint32 ssrc, VideoCapturer* capturer);
+ VideoCapturer* AddScreencast_w(uint32 ssrc, const ScreencastId& id);
bool RemoveScreencast_w(uint32 ssrc);
void OnScreencastWindowEvent_s(uint32 ssrc, rtc::WindowEvent we);
bool IsScreencasting_w() const;
void GetScreencastDetails_w(ScreencastDetailsData* d) const;
+ void SetScreenCaptureFactory_w(
+ ScreenCapturerFactory* screencapture_factory);
bool GetStats_w(VideoMediaInfo* stats);
virtual void OnMessage(rtc::Message* pmsg);
@@ -591,6 +604,7 @@
VoiceChannel* voice_channel_;
VideoRenderer* renderer_;
+ rtc::scoped_ptr<ScreenCapturerFactory> screencapture_factory_;
ScreencastMap screencast_capturers_;
rtc::scoped_ptr<VideoMediaMonitor> media_monitor_;
diff --git a/session/media/channel_unittest.cc b/session/media/channel_unittest.cc
index b2fc92b..cf0aad8 100644
--- a/session/media/channel_unittest.cc
+++ b/session/media/channel_unittest.cc
@@ -23,8 +23,16 @@
// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#include "webrtc/base/fileutils.h"
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/helpers.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/pathutils.h"
+#include "webrtc/base/signalthread.h"
+#include "webrtc/base/ssladapter.h"
+#include "webrtc/base/sslidentity.h"
+#include "webrtc/base/window.h"
#include "talk/media/base/fakemediaengine.h"
-#include "talk/media/base/fakescreencapturerfactory.h"
#include "talk/media/base/fakertp.h"
#include "talk/media/base/fakevideocapturer.h"
#include "talk/media/base/mediachannel.h"
@@ -37,15 +45,6 @@
#include "talk/session/media/mediarecorder.h"
#include "talk/session/media/mediasessionclient.h"
#include "talk/session/media/typingmonitor.h"
-#include "webrtc/base/fileutils.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/pathutils.h"
-#include "webrtc/base/signalthread.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/sslidentity.h"
-#include "webrtc/base/window.h"
#define MAYBE_SKIP_TEST(feature) \
if (!(rtc::SSLStreamAdapter::feature())) { \
@@ -89,6 +88,49 @@
typedef MediaInfoT MediaInfo;
};
+class FakeScreenCaptureFactory
+ : public cricket::VideoChannel::ScreenCapturerFactory,
+ public sigslot::has_slots<> {
+ public:
+ FakeScreenCaptureFactory()
+ : window_capturer_(NULL),
+ capture_state_(cricket::CS_STOPPED) {}
+
+ virtual cricket::VideoCapturer* CreateScreenCapturer(
+ const ScreencastId& window) {
+ if (window_capturer_ != NULL) {
+ // Class is only designed to handle one fake screencapturer.
+ ADD_FAILURE();
+ return NULL;
+ }
+ window_capturer_ = new cricket::FakeVideoCapturer;
+ window_capturer_->SignalDestroyed.connect(
+ this,
+ &FakeScreenCaptureFactory::OnWindowCapturerDestroyed);
+ window_capturer_->SignalStateChange.connect(
+ this,
+ &FakeScreenCaptureFactory::OnStateChange);
+ return window_capturer_;
+ }
+
+ cricket::FakeVideoCapturer* window_capturer() { return window_capturer_; }
+
+ cricket::CaptureState capture_state() { return capture_state_; }
+
+ private:
+ void OnWindowCapturerDestroyed(cricket::FakeVideoCapturer* capturer) {
+ if (capturer == window_capturer_) {
+ window_capturer_ = NULL;
+ }
+ }
+ void OnStateChange(cricket::VideoCapturer*, cricket::CaptureState state) {
+ capture_state_ = state;
+ }
+
+ cricket::FakeVideoCapturer* window_capturer_;
+ cricket::CaptureState capture_state_;
+};
+
// Controls how long we wait for a session to send messages that we
// expect, in milliseconds. We put it high to avoid flaky tests.
static const int kEventTimeout = 5000;
@@ -2427,31 +2469,28 @@
TEST_F(VideoChannelTest, TestScreencastEvents) {
const int kTimeoutMs = 500;
TestInit();
+ FakeScreenCaptureFactory* screencapture_factory =
+ new FakeScreenCaptureFactory();
+ channel1_->SetScreenCaptureFactory(screencapture_factory);
cricket::ScreencastEventCatcher catcher;
channel1_->SignalScreencastWindowEvent.connect(
&catcher,
&cricket::ScreencastEventCatcher::OnEvent);
-
- rtc::scoped_ptr<cricket::FakeScreenCapturerFactory>
- screen_capturer_factory(new cricket::FakeScreenCapturerFactory());
- cricket::VideoCapturer* screen_capturer = screen_capturer_factory->Create(
- ScreencastId(WindowId(0)));
- ASSERT_TRUE(screen_capturer != NULL);
-
- EXPECT_TRUE(channel1_->AddScreencast(0, screen_capturer));
- EXPECT_EQ_WAIT(cricket::CS_STOPPED, screen_capturer_factory->capture_state(),
+ EXPECT_TRUE(channel1_->AddScreencast(0, ScreencastId(WindowId(0))) != NULL);
+ ASSERT_TRUE(screencapture_factory->window_capturer() != NULL);
+ EXPECT_EQ_WAIT(cricket::CS_STOPPED, screencapture_factory->capture_state(),
kTimeoutMs);
-
- screen_capturer->SignalStateChange(screen_capturer, cricket::CS_PAUSED);
+ screencapture_factory->window_capturer()->SignalStateChange(
+ screencapture_factory->window_capturer(), cricket::CS_PAUSED);
EXPECT_EQ_WAIT(rtc::WE_MINIMIZE, catcher.event(), kTimeoutMs);
-
- screen_capturer->SignalStateChange(screen_capturer, cricket::CS_RUNNING);
+ screencapture_factory->window_capturer()->SignalStateChange(
+ screencapture_factory->window_capturer(), cricket::CS_RUNNING);
EXPECT_EQ_WAIT(rtc::WE_RESTORE, catcher.event(), kTimeoutMs);
-
- screen_capturer->SignalStateChange(screen_capturer, cricket::CS_STOPPED);
+ screencapture_factory->window_capturer()->SignalStateChange(
+ screencapture_factory->window_capturer(), cricket::CS_STOPPED);
EXPECT_EQ_WAIT(rtc::WE_CLOSE, catcher.event(), kTimeoutMs);
-
EXPECT_TRUE(channel1_->RemoveScreencast(0));
+ ASSERT_TRUE(screencapture_factory->window_capturer() == NULL);
}
TEST_F(VideoChannelTest, TestUpdateStreamsInLocalContent) {
diff --git a/session/media/channelmanager.cc b/session/media/channelmanager.cc
index 8ceb148..684e9a9 100644
--- a/session/media/channelmanager.cc
+++ b/session/media/channelmanager.cc
@@ -33,6 +33,12 @@
#include <algorithm>
+#include "webrtc/base/bind.h"
+#include "webrtc/base/common.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/sigslotrepeater.h"
+#include "webrtc/base/stringencode.h"
+#include "webrtc/base/stringutils.h"
#include "talk/media/base/capturemanager.h"
#include "talk/media/base/hybriddataengine.h"
#include "talk/media/base/rtpdataengine.h"
@@ -43,12 +49,6 @@
#endif
#include "talk/session/media/soundclip.h"
#include "talk/session/media/srtpfilter.h"
-#include "webrtc/base/bind.h"
-#include "webrtc/base/common.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/sigslotrepeater.h"
-#include "webrtc/base/stringencode.h"
-#include "webrtc/base/stringutils.h"
namespace cricket {
@@ -710,11 +710,6 @@
return capturer;
}
-VideoCapturer* ChannelManager::CreateScreenCapturer(
- const ScreencastId& screenid) {
- return device_manager_->CreateScreenCapturer(screenid);
-}
-
bool ChannelManager::SetCaptureDevice_w(const Device* cam_device) {
ASSERT(worker_thread_ == rtc::Thread::Current());
ASSERT(initialized_);
diff --git a/session/media/channelmanager.h b/session/media/channelmanager.h
index e13ae12..d742280 100644
--- a/session/media/channelmanager.h
+++ b/session/media/channelmanager.h
@@ -31,14 +31,14 @@
#include <string>
#include <vector>
-#include "talk/media/base/capturemanager.h"
-#include "talk/media/base/mediaengine.h"
-#include "talk/p2p/base/session.h"
-#include "talk/session/media/voicechannel.h"
#include "webrtc/base/criticalsection.h"
#include "webrtc/base/fileutils.h"
#include "webrtc/base/sigslotrepeater.h"
#include "webrtc/base/thread.h"
+#include "talk/media/base/capturemanager.h"
+#include "talk/media/base/mediaengine.h"
+#include "talk/p2p/base/session.h"
+#include "talk/session/media/voicechannel.h"
namespace cricket {
@@ -157,8 +157,6 @@
bool GetVideoCaptureDevice(Device* device);
// Create capturer based on what has been set in SetCaptureDevice().
VideoCapturer* CreateVideoCapturer();
- // Create capturer from a screen.
- VideoCapturer* CreateScreenCapturer(const ScreencastId& screenid);
bool SetCaptureDevice(const std::string& cam_device);
bool SetDefaultVideoEncoderConfig(const VideoEncoderConfig& config);
// RTX will be enabled/disabled in engines that support it. The supporting
@@ -242,9 +240,6 @@
const AudioOptions& options,
int delay_offset);
int audio_delay_offset() const { return audio_delay_offset_; }
- // This is here so that ChannelManager subclasses can set the video
- // capturer factories to use.
- DeviceManagerInterface* device_manager() { return device_manager_.get(); }
private:
typedef std::vector<VoiceChannel*> VoiceChannels;
