Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(273)

Unified Diff: talk/app/webrtc/objc/RTCVideoCapturer.mm

Issue 1715883002: Remove DeviceManager and DeviceInfo. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | talk/app/webrtc/objc/public/RTCVideoCapturer.h » ('j') | webrtc/api/api.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..52119ce47840f3c4fbd2cc1a09f32c1f78f47058 100644
--- a/talk/app/webrtc/objc/RTCVideoCapturer.mm
+++ b/talk/app/webrtc/objc/RTCVideoCapturer.mm
@@ -32,30 +32,11 @@
#import "RTCVideoCapturer+Internal.h"
#include "webrtc/media/base/videocapturer.h"
-#include "webrtc/media/devices/devicemanager.h"
@implementation RTCVideoCapturer {
rtc::scoped_ptr<cricket::VideoCapturer> _capturer;
}
-+ (RTCVideoCapturer*)capturerWithDeviceName:(NSString*)deviceName {
tkchin_webrtc 2016/03/02 21:13:37 What is the new way of getting the cricket video c
the sun 2016/03/03 20:00:13 I'm now using WebRtcVideoDeviceCapturerFactory to
tkchin_webrtc 2016/03/04 01:18:35 Nah, not worth adding a test for this. I've patche
the sun 2016/03/04 07:48:15 Thank you!
- 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));
- RTCVideoCapturer* rtcCapturer =
- [[RTCVideoCapturer alloc] initWithCapturer:capturer.release()];
- return rtcCapturer;
-}
-
@end
@implementation RTCVideoCapturer (Internal)
« no previous file with comments | « no previous file | talk/app/webrtc/objc/public/RTCVideoCapturer.h » ('j') | webrtc/api/api.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698