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

Side by Side Diff: webrtc/modules/video_capture/ios/video_capture_ios.mm

Issue 1413333002: system_wrappers: rename interface -> include (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased again! Created 5 years, 1 month 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) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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 #if !defined(__has_feature) || !__has_feature(objc_arc) 11 #if !defined(__has_feature) || !__has_feature(objc_arc)
12 #error "This file requires ARC support." 12 #error "This file requires ARC support."
13 #endif 13 #endif
14 14
15 #include "webrtc/modules/video_capture/ios/device_info_ios_objc.h" 15 #include "webrtc/modules/video_capture/ios/device_info_ios_objc.h"
16 #include "webrtc/modules/video_capture/ios/rtc_video_capture_ios_objc.h" 16 #include "webrtc/modules/video_capture/ios/rtc_video_capture_ios_objc.h"
17 #include "webrtc/system_wrappers/interface/ref_count.h" 17 #include "webrtc/system_wrappers/include/ref_count.h"
18 #include "webrtc/system_wrappers/interface/trace.h" 18 #include "webrtc/system_wrappers/include/trace.h"
19 19
20 using namespace webrtc; 20 using namespace webrtc;
21 using namespace videocapturemodule; 21 using namespace videocapturemodule;
22 22
23 VideoCaptureModule* VideoCaptureImpl::Create(const int32_t capture_id, 23 VideoCaptureModule* VideoCaptureImpl::Create(const int32_t capture_id,
24 const char* deviceUniqueIdUTF8) { 24 const char* deviceUniqueIdUTF8) {
25 return VideoCaptureIos::Create(capture_id, deviceUniqueIdUTF8); 25 return VideoCaptureIos::Create(capture_id, deviceUniqueIdUTF8);
26 } 26 }
27 27
28 VideoCaptureIos::VideoCaptureIos(const int32_t capture_id) 28 VideoCaptureIos::VideoCaptureIos(const int32_t capture_id)
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 return 0; 94 return 0;
95 } 95 }
96 96
97 bool VideoCaptureIos::CaptureStarted() { return is_capturing_; } 97 bool VideoCaptureIos::CaptureStarted() { return is_capturing_; }
98 98
99 int32_t VideoCaptureIos::CaptureSettings(VideoCaptureCapability& settings) { 99 int32_t VideoCaptureIos::CaptureSettings(VideoCaptureCapability& settings) {
100 settings = capability_; 100 settings = capability_;
101 settings.rawType = kVideoNV12; 101 settings.rawType = kVideoNV12;
102 return 0; 102 return 0;
103 } 103 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698