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

Side by Side Diff: talk/app/webrtc/objc/RTCVideoCapturer.mm

Issue 1587193006: Move talk/media to webrtc/media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased to b647aca12a884a13c1728118586245399b55fa3d (#11493) Created 4 years, 10 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 * libjingle 2 * libjingle
3 * Copyright 2013 Google Inc. 3 * Copyright 2013 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 13 matching lines...) Expand all
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28 #if !defined(__has_feature) || !__has_feature(objc_arc) 28 #if !defined(__has_feature) || !__has_feature(objc_arc)
29 #error "This file requires ARC support." 29 #error "This file requires ARC support."
30 #endif 30 #endif
31 31
32 #import "RTCVideoCapturer+Internal.h" 32 #import "RTCVideoCapturer+Internal.h"
33 33
34 #include "talk/media/base/videocapturer.h" 34 #include "webrtc/media/base/videocapturer.h"
35 #include "talk/media/devices/devicemanager.h" 35 #include "webrtc/media/devices/devicemanager.h"
36 36
37 @implementation RTCVideoCapturer { 37 @implementation RTCVideoCapturer {
38 rtc::scoped_ptr<cricket::VideoCapturer> _capturer; 38 rtc::scoped_ptr<cricket::VideoCapturer> _capturer;
39 } 39 }
40 40
41 + (RTCVideoCapturer*)capturerWithDeviceName:(NSString*)deviceName { 41 + (RTCVideoCapturer*)capturerWithDeviceName:(NSString*)deviceName {
42 const std::string& device_name = std::string([deviceName UTF8String]); 42 const std::string& device_name = std::string([deviceName UTF8String]);
43 rtc::scoped_ptr<cricket::DeviceManagerInterface> device_manager( 43 rtc::scoped_ptr<cricket::DeviceManagerInterface> device_manager(
44 cricket::DeviceManagerFactory::Create()); 44 cricket::DeviceManagerFactory::Create());
45 bool initialized = device_manager->Init(); 45 bool initialized = device_manager->Init();
(...skipping 19 matching lines...) Expand all
65 _capturer.reset(capturer); 65 _capturer.reset(capturer);
66 } 66 }
67 return self; 67 return self;
68 } 68 }
69 69
70 - (cricket::VideoCapturer*)takeNativeCapturer { 70 - (cricket::VideoCapturer*)takeNativeCapturer {
71 return _capturer.release(); 71 return _capturer.release();
72 } 72 }
73 73
74 @end 74 @end
OLDNEW
« no previous file with comments | « talk/app/webrtc/objc/RTCI420Frame+Internal.h ('k') | talk/app/webrtc/objc/avfoundationvideocapturer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698