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

Side by Side Diff: webrtc/modules/video_capture/ios/device_info_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 <AVFoundation/AVFoundation.h> 15 #include <AVFoundation/AVFoundation.h>
16 16
17 #include <string> 17 #include <string>
18 18
19 #include "webrtc/modules/video_capture/ios/device_info_ios.h" 19 #include "webrtc/modules/video_capture/ios/device_info_ios.h"
20 #include "webrtc/modules/video_capture/ios/device_info_ios_objc.h" 20 #include "webrtc/modules/video_capture/ios/device_info_ios_objc.h"
21 #include "webrtc/modules/video_capture/video_capture_impl.h" 21 #include "webrtc/modules/video_capture/video_capture_impl.h"
22 #include "webrtc/system_wrappers/interface/trace.h" 22 #include "webrtc/system_wrappers/include/trace.h"
23 23
24 using namespace webrtc; 24 using namespace webrtc;
25 using namespace videocapturemodule; 25 using namespace videocapturemodule;
26 26
27 static NSArray *camera_presets = @[AVCaptureSessionPreset352x288, 27 static NSArray *camera_presets = @[AVCaptureSessionPreset352x288,
28 AVCaptureSessionPreset640x480, 28 AVCaptureSessionPreset640x480,
29 AVCaptureSessionPreset1280x720, 29 AVCaptureSessionPreset1280x720,
30 AVCaptureSessionPreset1920x1080]; 30 AVCaptureSessionPreset1920x1080];
31 31
32 32
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 std::map<std::string, std::vector<VideoCaptureCapability>>::iterator it = 169 std::map<std::string, std::vector<VideoCaptureCapability>>::iterator it =
170 _capabilitiesMap.find(deviceName); 170 _capabilitiesMap.find(deviceName);
171 VideoCaptureCapabilities deviceCapabilities; 171 VideoCaptureCapabilities deviceCapabilities;
172 if (it != _capabilitiesMap.end()) { 172 if (it != _capabilitiesMap.end()) {
173 _captureCapabilities = it->second; 173 _captureCapabilities = it->second;
174 return 0; 174 return 0;
175 } 175 }
176 176
177 return -1; 177 return -1;
178 } 178 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698