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

Side by Side Diff: webrtc/modules/video_capture/objc/video_capture.mm

Issue 2974613003: base->rtc_base: Update .c, .mm and .java files. (Closed)
Patch Set: Created 3 years, 5 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
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/base/refcount.h"
16 #include "webrtc/base/scoped_ref_ptr.h"
17 #include "webrtc/modules/video_capture/objc/device_info_objc.h" 15 #include "webrtc/modules/video_capture/objc/device_info_objc.h"
18 #include "webrtc/modules/video_capture/objc/rtc_video_capture_objc.h" 16 #include "webrtc/modules/video_capture/objc/rtc_video_capture_objc.h"
17 #include "webrtc/rtc_base/refcount.h"
18 #include "webrtc/rtc_base/scoped_ref_ptr.h"
19 19
20 using namespace webrtc; 20 using namespace webrtc;
21 using namespace videocapturemodule; 21 using namespace videocapturemodule;
22 22
23 rtc::scoped_refptr<VideoCaptureModule> VideoCaptureImpl::Create( 23 rtc::scoped_refptr<VideoCaptureModule> VideoCaptureImpl::Create(
24 const char* deviceUniqueIdUTF8) { 24 const char* deviceUniqueIdUTF8) {
25 return VideoCaptureIos::Create(deviceUniqueIdUTF8); 25 return VideoCaptureIos::Create(deviceUniqueIdUTF8);
26 } 26 }
27 27
28 VideoCaptureIos::VideoCaptureIos() 28 VideoCaptureIos::VideoCaptureIos()
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 96
97 bool VideoCaptureIos::CaptureStarted() { 97 bool VideoCaptureIos::CaptureStarted() {
98 return is_capturing_; 98 return is_capturing_;
99 } 99 }
100 100
101 int32_t VideoCaptureIos::CaptureSettings(VideoCaptureCapability& settings) { 101 int32_t VideoCaptureIos::CaptureSettings(VideoCaptureCapability& settings) {
102 settings = capability_; 102 settings = capability_;
103 settings.videoType = VideoType::kNV12; 103 settings.videoType = VideoType::kNV12;
104 return 0; 104 return 0;
105 } 105 }
OLDNEW
« no previous file with comments | « webrtc/modules/desktop_capture/window_capturer_mac.mm ('k') | webrtc/rtc_base/applefilesystem.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698