| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| 11 #include "webrtc/modules/video_capture/video_capture_factory.h" | 11 #include "webrtc/modules/video_capture/video_capture_factory.h" |
| 12 | 12 |
| 13 #include "webrtc/modules/video_capture/video_capture_impl.h" | 13 #include "webrtc/modules/video_capture/video_capture_impl.h" |
| 14 | 14 |
| 15 namespace webrtc | 15 namespace webrtc { |
| 16 { | |
| 17 | 16 |
| 18 VideoCaptureModule* VideoCaptureFactory::Create(const int32_t id, | 17 rtc::scoped_refptr<VideoCaptureModule> VideoCaptureFactory::Create( |
| 18 const int32_t id, |
| 19 const char* deviceUniqueIdUTF8) { | 19 const char* deviceUniqueIdUTF8) { |
| 20 #if defined(ANDROID) | 20 #if defined(ANDROID) |
| 21 return nullptr; | 21 return nullptr; |
| 22 #else | 22 #else |
| 23 return videocapturemodule::VideoCaptureImpl::Create(id, deviceUniqueIdUTF8); | 23 return videocapturemodule::VideoCaptureImpl::Create(id, deviceUniqueIdUTF8); |
| 24 #endif | 24 #endif |
| 25 } | 25 } |
| 26 | 26 |
| 27 VideoCaptureModule* VideoCaptureFactory::Create(const int32_t id, | 27 rtc::scoped_refptr<VideoCaptureModule> VideoCaptureFactory::Create( |
| 28 const int32_t id, |
| 28 VideoCaptureExternal*& externalCapture) { | 29 VideoCaptureExternal*& externalCapture) { |
| 29 return videocapturemodule::VideoCaptureImpl::Create(id, externalCapture); | 30 return videocapturemodule::VideoCaptureImpl::Create(id, externalCapture); |
| 30 } | 31 } |
| 31 | 32 |
| 32 VideoCaptureModule::DeviceInfo* VideoCaptureFactory::CreateDeviceInfo( | 33 VideoCaptureModule::DeviceInfo* VideoCaptureFactory::CreateDeviceInfo( |
| 33 const int32_t id) { | 34 const int32_t id) { |
| 34 #if defined(ANDROID) | 35 #if defined(ANDROID) |
| 35 return nullptr; | 36 return nullptr; |
| 36 #else | 37 #else |
| 37 return videocapturemodule::VideoCaptureImpl::CreateDeviceInfo(id); | 38 return videocapturemodule::VideoCaptureImpl::CreateDeviceInfo(id); |
| 38 #endif | 39 #endif |
| 39 } | 40 } |
| 40 | 41 |
| 41 } // namespace webrtc | 42 } // namespace webrtc |
| OLD | NEW |