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

Unified Diff: webrtc/modules/video_capture/objc/rtc_video_capture_objc.h

Issue 2309253005: Unify the macOS and iOS capturer implementations (Closed)
Patch Set: remove added presubmit filter Created 4 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/video_capture/objc/rtc_video_capture_objc.h
diff --git a/webrtc/modules/video_capture/ios/rtc_video_capture_ios_objc.h b/webrtc/modules/video_capture/objc/rtc_video_capture_objc.h
similarity index 77%
rename from webrtc/modules/video_capture/ios/rtc_video_capture_ios_objc.h
rename to webrtc/modules/video_capture/objc/rtc_video_capture_objc.h
index 2653958130aa489bb3240fa38acb2fb007cd1f1e..e108ee1bb38e40a43e6674b014d19b0ba7993abc 100644
--- a/webrtc/modules/video_capture/ios/rtc_video_capture_ios_objc.h
+++ b/webrtc/modules/video_capture/objc/rtc_video_capture_objc.h
@@ -8,13 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_MODULES_VIDEO_CAPTURE_IOS_VIDEO_CAPTURE_IOS_OBJC_H_
-#define WEBRTC_MODULES_VIDEO_CAPTURE_IOS_VIDEO_CAPTURE_IOS_OBJC_H_
+#ifndef WEBRTC_MODULES_VIDEO_CAPTURE_OBJC_RTC_VIDEO_CAPTURE_OBJC_H_
+#define WEBRTC_MODULES_VIDEO_CAPTURE_OBJC_RTC_VIDEO_CAPTURE_OBJC_H_
#import <Foundation/Foundation.h>
+#ifdef WEBRTC_IOS
#import <UIKit/UIKit.h>
+#endif
-#include "webrtc/modules/video_capture/ios/video_capture_ios.h"
+#include "webrtc/modules/video_capture/objc/video_capture.h"
// The following class listens to a notification with name:
// 'StatusBarOrientationDidChange'.
@@ -32,8 +34,8 @@
captureId:(int)captureId;
- (BOOL)setCaptureDeviceByUniqueId:(NSString*)uniqueId;
- (BOOL)startCaptureWithCapability:
- (const webrtc::VideoCaptureCapability&)capability;
+ (const webrtc::VideoCaptureCapability&)capability;
- (BOOL)stopCapture;
@end
-#endif // WEBRTC_MODULES_VIDEO_CAPTURE_IOS_VIDEO_CAPTURE_IOS_OBJC_H_
+#endif // WEBRTC_MODULES_VIDEO_CAPTURE_OBJC_RTC_VIDEO_CAPTURE_OBJC_H_
« no previous file with comments | « webrtc/modules/video_capture/objc/device_info_objc.mm ('k') | webrtc/modules/video_capture/objc/rtc_video_capture_objc.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698