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

Side by Side Diff: webrtc/modules/video_capture/video_capture_factory.cc

Issue 2534553002: Replace VideoCaptureDataCallback by VideoSinkInterface. (Closed)
Patch Set: Break overlong lines. Created 4 years 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 unified diff | Download patch
OLDNEW
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 16
17 rtc::scoped_refptr<VideoCaptureModule> VideoCaptureFactory::Create( 17 rtc::scoped_refptr<VideoCaptureModule> VideoCaptureFactory::Create(
18 const int32_t id,
19 const char* deviceUniqueIdUTF8) { 18 const char* deviceUniqueIdUTF8) {
20 #if defined(ANDROID) 19 #if defined(ANDROID)
21 return nullptr; 20 return nullptr;
22 #else 21 #else
23 return videocapturemodule::VideoCaptureImpl::Create(id, deviceUniqueIdUTF8); 22 return videocapturemodule::VideoCaptureImpl::Create(deviceUniqueIdUTF8);
24 #endif 23 #endif
25 } 24 }
26 25
27 rtc::scoped_refptr<VideoCaptureModule> VideoCaptureFactory::Create( 26 rtc::scoped_refptr<VideoCaptureModule> VideoCaptureFactory::Create(
28 const int32_t id,
29 VideoCaptureExternal*& externalCapture) { 27 VideoCaptureExternal*& externalCapture) {
30 return videocapturemodule::VideoCaptureImpl::Create(id, externalCapture); 28 return videocapturemodule::VideoCaptureImpl::Create(externalCapture);
31 } 29 }
32 30
33 VideoCaptureModule::DeviceInfo* VideoCaptureFactory::CreateDeviceInfo( 31 VideoCaptureModule::DeviceInfo* VideoCaptureFactory::CreateDeviceInfo() {
34 const int32_t id) {
35 #if defined(ANDROID) 32 #if defined(ANDROID)
36 return nullptr; 33 return nullptr;
37 #else 34 #else
38 return videocapturemodule::VideoCaptureImpl::CreateDeviceInfo(id); 35 return videocapturemodule::VideoCaptureImpl::CreateDeviceInfo();
39 #endif 36 #endif
40 } 37 }
41 38
42 } // namespace webrtc 39 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/video_capture/video_capture_factory.h ('k') | webrtc/modules/video_capture/video_capture_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698