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

Side by Side Diff: webrtc/modules/video_capture/ios/rtc_video_capture_ios_objc.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 #import <UIKit/UIKit.h> 15 #import <UIKit/UIKit.h>
16 16
17 #import "webrtc/modules/video_capture/ios/device_info_ios_objc.h" 17 #import "webrtc/modules/video_capture/ios/device_info_ios_objc.h"
18 #import "webrtc/modules/video_capture/ios/rtc_video_capture_ios_objc.h" 18 #import "webrtc/modules/video_capture/ios/rtc_video_capture_ios_objc.h"
19 19
20 #include "webrtc/system_wrappers/interface/trace.h" 20 #include "webrtc/system_wrappers/include/trace.h"
21 21
22 using namespace webrtc; 22 using namespace webrtc;
23 using namespace webrtc::videocapturemodule; 23 using namespace webrtc::videocapturemodule;
24 24
25 @interface RTCVideoCaptureIosObjC (hidden) 25 @interface RTCVideoCaptureIosObjC (hidden)
26 - (int)changeCaptureInputWithName:(NSString*)captureDeviceName; 26 - (int)changeCaptureInputWithName:(NSString*)captureDeviceName;
27 @end 27 @end
28 28
29 @implementation RTCVideoCaptureIosObjC { 29 @implementation RTCVideoCaptureIosObjC {
30 webrtc::videocapturemodule::VideoCaptureIos* _owner; 30 webrtc::videocapturemodule::VideoCaptureIos* _owner;
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 } 414 }
415 415
416 - (void)waitForCaptureChangeToFinish { 416 - (void)waitForCaptureChangeToFinish {
417 [_captureChangingCondition lock]; 417 [_captureChangingCondition lock];
418 while (_captureChanging) { 418 while (_captureChanging) {
419 [_captureChangingCondition wait]; 419 [_captureChangingCondition wait];
420 } 420 }
421 [_captureChangingCondition unlock]; 421 [_captureChangingCondition unlock];
422 } 422 }
423 @end 423 @end
OLDNEW
« no previous file with comments | « webrtc/modules/video_capture/ios/device_info_ios.mm ('k') | webrtc/modules/video_capture/ios/video_capture_ios.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698