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

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

Issue 1347083003: Remove the video capture module on Android. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Removed Android Java files Created 5 years, 3 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 unified diff | Download patch
« no previous file with comments | « webrtc/modules/video_capture/video_capture.gypi ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/include/video_capture_factory.h" 11 #include "webrtc/modules/video_capture/include/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 17
18 VideoCaptureModule* VideoCaptureFactory::Create(const int32_t id, 18 VideoCaptureModule* VideoCaptureFactory::Create(const int32_t id,
19 const char* deviceUniqueIdUTF8) { 19 const char* deviceUniqueIdUTF8) {
20 #if defined(ANDROID)
21 return nullptr;
22 #else
20 return videocapturemodule::VideoCaptureImpl::Create(id, deviceUniqueIdUTF8); 23 return videocapturemodule::VideoCaptureImpl::Create(id, deviceUniqueIdUTF8);
24 #endif
21 } 25 }
22 26
23 VideoCaptureModule* VideoCaptureFactory::Create(const int32_t id, 27 VideoCaptureModule* VideoCaptureFactory::Create(const int32_t id,
24 VideoCaptureExternal*& externalCapture) { 28 VideoCaptureExternal*& externalCapture) {
25 return videocapturemodule::VideoCaptureImpl::Create(id, externalCapture); 29 return videocapturemodule::VideoCaptureImpl::Create(id, externalCapture);
26 } 30 }
27 31
28 VideoCaptureModule::DeviceInfo* VideoCaptureFactory::CreateDeviceInfo( 32 VideoCaptureModule::DeviceInfo* VideoCaptureFactory::CreateDeviceInfo(
29 const int32_t id) { 33 const int32_t id) {
34 #if defined(ANDROID)
35 return nullptr;
36 #else
30 return videocapturemodule::VideoCaptureImpl::CreateDeviceInfo(id); 37 return videocapturemodule::VideoCaptureImpl::CreateDeviceInfo(id);
38 #endif
31 } 39 }
32 40
33 } // namespace webrtc 41 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/video_capture/video_capture.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698