OLD | NEW |
---|---|
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2013 Google Inc. | 3 * Copyright 2013 Google Inc. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
7 * | 7 * |
8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
(...skipping 14 matching lines...) Expand all Loading... | |
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 */ | 26 */ |
27 | 27 |
28 #if !defined(__has_feature) || !__has_feature(objc_arc) | 28 #if !defined(__has_feature) || !__has_feature(objc_arc) |
29 #error "This file requires ARC support." | 29 #error "This file requires ARC support." |
30 #endif | 30 #endif |
31 | 31 |
32 #import "RTCVideoCapturer+Internal.h" | 32 #import "RTCVideoCapturer+Internal.h" |
33 | 33 |
34 #include "webrtc/media/base/videocapturer.h" | 34 #include "webrtc/media/base/videocapturer.h" |
35 #include "webrtc/media/devices/devicemanager.h" | 35 #include "webrtc/media/engine/webrtcvideocapturerfactory.h" |
36 | 36 |
37 @implementation RTCVideoCapturer { | 37 @implementation RTCVideoCapturer { |
38 rtc::scoped_ptr<cricket::VideoCapturer> _capturer; | 38 rtc::scoped_ptr<cricket::VideoCapturer> _capturer; |
39 } | 39 } |
40 | 40 |
41 + (RTCVideoCapturer*)capturerWithDeviceName:(NSString*)deviceName { | 41 + (RTCVideoCapturer*)capturerWithDeviceName:(NSString*)deviceName { |
42 const std::string& device_name = std::string([deviceName UTF8String]); | 42 cricket::WebRtcVideoDeviceCapturerFactory factory; |
43 rtc::scoped_ptr<cricket::DeviceManagerInterface> device_manager( | 43 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.
| |
44 cricket::DeviceManagerFactory::Create()); | 44 rtc::scoped_ptr<cricket::VideoCapturer> capturer(factory.Create(device)); |
45 bool initialized = device_manager->Init(); | |
46 NSAssert(initialized, @"DeviceManager::Init() failed"); | |
47 cricket::Device device; | |
48 if (!device_manager->GetVideoCaptureDevice(device_name, &device)) { | |
49 LOG(LS_ERROR) << "GetVideoCaptureDevice failed"; | |
50 return 0; | |
51 } | |
52 rtc::scoped_ptr<cricket::VideoCapturer> capturer( | |
53 device_manager->CreateVideoCapturer(device)); | |
54 RTCVideoCapturer* rtcCapturer = | 45 RTCVideoCapturer* rtcCapturer = |
55 [[RTCVideoCapturer alloc] initWithCapturer:capturer.release()]; | 46 [[RTCVideoCapturer alloc] initWithCapturer:capturer.release()]; |
56 return rtcCapturer; | 47 return rtcCapturer; |
57 } | 48 } |
58 | 49 |
59 @end | 50 @end |
60 | 51 |
61 @implementation RTCVideoCapturer (Internal) | 52 @implementation RTCVideoCapturer (Internal) |
62 | 53 |
63 - (id)initWithCapturer:(cricket::VideoCapturer*)capturer { | 54 - (id)initWithCapturer:(cricket::VideoCapturer*)capturer { |
64 if ((self = [super init])) { | 55 if ((self = [super init])) { |
65 _capturer.reset(capturer); | 56 _capturer.reset(capturer); |
66 } | 57 } |
67 return self; | 58 return self; |
68 } | 59 } |
69 | 60 |
70 - (cricket::VideoCapturer*)takeNativeCapturer { | 61 - (cricket::VideoCapturer*)takeNativeCapturer { |
71 return _capturer.release(); | 62 return _capturer.release(); |
72 } | 63 } |
73 | 64 |
74 @end | 65 @end |
OLD | NEW |