| 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 13 matching lines...) Expand all Loading... |
| 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
| 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 <memory> |
| 35 |
| 34 #include "webrtc/media/base/videocapturer.h" | 36 #include "webrtc/media/base/videocapturer.h" |
| 35 #include "webrtc/media/devices/devicemanager.h" | 37 #include "webrtc/media/devices/devicemanager.h" |
| 36 | 38 |
| 37 @implementation RTCVideoCapturer { | 39 @implementation RTCVideoCapturer { |
| 38 rtc::scoped_ptr<cricket::VideoCapturer> _capturer; | 40 std::unique_ptr<cricket::VideoCapturer> _capturer; |
| 39 } | 41 } |
| 40 | 42 |
| 41 + (RTCVideoCapturer*)capturerWithDeviceName:(NSString*)deviceName { | 43 + (RTCVideoCapturer*)capturerWithDeviceName:(NSString*)deviceName { |
| 42 const std::string& device_name = std::string([deviceName UTF8String]); | 44 const std::string& device_name = std::string([deviceName UTF8String]); |
| 43 rtc::scoped_ptr<cricket::DeviceManagerInterface> device_manager( | 45 std::unique_ptr<cricket::DeviceManagerInterface> device_manager( |
| 44 cricket::DeviceManagerFactory::Create()); | 46 cricket::DeviceManagerFactory::Create()); |
| 45 bool initialized = device_manager->Init(); | 47 bool initialized = device_manager->Init(); |
| 46 NSAssert(initialized, @"DeviceManager::Init() failed"); | 48 NSAssert(initialized, @"DeviceManager::Init() failed"); |
| 47 cricket::Device device; | 49 cricket::Device device; |
| 48 if (!device_manager->GetVideoCaptureDevice(device_name, &device)) { | 50 if (!device_manager->GetVideoCaptureDevice(device_name, &device)) { |
| 49 LOG(LS_ERROR) << "GetVideoCaptureDevice failed"; | 51 LOG(LS_ERROR) << "GetVideoCaptureDevice failed"; |
| 50 return 0; | 52 return 0; |
| 51 } | 53 } |
| 52 rtc::scoped_ptr<cricket::VideoCapturer> capturer( | 54 std::unique_ptr<cricket::VideoCapturer> capturer( |
| 53 device_manager->CreateVideoCapturer(device)); | 55 device_manager->CreateVideoCapturer(device)); |
| 54 RTCVideoCapturer* rtcCapturer = | 56 RTCVideoCapturer* rtcCapturer = |
| 55 [[RTCVideoCapturer alloc] initWithCapturer:capturer.release()]; | 57 [[RTCVideoCapturer alloc] initWithCapturer:capturer.release()]; |
| 56 return rtcCapturer; | 58 return rtcCapturer; |
| 57 } | 59 } |
| 58 | 60 |
| 59 @end | 61 @end |
| 60 | 62 |
| 61 @implementation RTCVideoCapturer (Internal) | 63 @implementation RTCVideoCapturer (Internal) |
| 62 | 64 |
| 63 - (id)initWithCapturer:(cricket::VideoCapturer*)capturer { | 65 - (id)initWithCapturer:(cricket::VideoCapturer*)capturer { |
| 64 if ((self = [super init])) { | 66 if ((self = [super init])) { |
| 65 _capturer.reset(capturer); | 67 _capturer.reset(capturer); |
| 66 } | 68 } |
| 67 return self; | 69 return self; |
| 68 } | 70 } |
| 69 | 71 |
| 70 - (cricket::VideoCapturer*)takeNativeCapturer { | 72 - (cricket::VideoCapturer*)takeNativeCapturer { |
| 71 return _capturer.release(); | 73 return _capturer.release(); |
| 72 } | 74 } |
| 73 | 75 |
| 74 @end | 76 @end |
| OLD | NEW |