Chromium Code Reviews| Index: talk/app/webrtc/objc/RTCVideoCapturer.mm |
| diff --git a/talk/app/webrtc/objc/RTCVideoCapturer.mm b/talk/app/webrtc/objc/RTCVideoCapturer.mm |
| index 2ce01f53a360e913f41a198c0a297768f2a9cb70..920a4b849a2f8639048494c20777b16457532992 100644 |
| --- a/talk/app/webrtc/objc/RTCVideoCapturer.mm |
| +++ b/talk/app/webrtc/objc/RTCVideoCapturer.mm |
| @@ -32,25 +32,16 @@ |
| #import "RTCVideoCapturer+Internal.h" |
| #include "webrtc/media/base/videocapturer.h" |
| -#include "webrtc/media/devices/devicemanager.h" |
| +#include "webrtc/media/engine/webrtcvideocapturerfactory.h" |
| @implementation RTCVideoCapturer { |
| rtc::scoped_ptr<cricket::VideoCapturer> _capturer; |
| } |
| + (RTCVideoCapturer*)capturerWithDeviceName:(NSString*)deviceName { |
| - const std::string& device_name = std::string([deviceName UTF8String]); |
| - rtc::scoped_ptr<cricket::DeviceManagerInterface> device_manager( |
| - cricket::DeviceManagerFactory::Create()); |
| - bool initialized = device_manager->Init(); |
| - NSAssert(initialized, @"DeviceManager::Init() failed"); |
| - cricket::Device device; |
| - if (!device_manager->GetVideoCaptureDevice(device_name, &device)) { |
| - LOG(LS_ERROR) << "GetVideoCaptureDevice failed"; |
| - return 0; |
| - } |
| - rtc::scoped_ptr<cricket::VideoCapturer> capturer( |
| - device_manager->CreateVideoCapturer(device)); |
| + cricket::WebRtcVideoDeviceCapturerFactory factory; |
| + cricket::Device device(std::string([deviceName UTF8String]), 0); |
|
tkchin_webrtc
2016/03/04 01:18:35
nit deviceName.UTF8String
the sun
2016/03/04 07:48:15
Done.
|
| + rtc::scoped_ptr<cricket::VideoCapturer> capturer(factory.Create(device)); |
| RTCVideoCapturer* rtcCapturer = |
| [[RTCVideoCapturer alloc] initWithCapturer:capturer.release()]; |
| return rtcCapturer; |