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

Unified Diff: webrtc/modules/video_capture/objc/device_info_objc.mm

Issue 2375273004: Reland of Unify the macOS and iOS capturer implementations (Closed)
Patch Set: fix gyp build 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/device_info_objc.mm
diff --git a/webrtc/modules/video_capture/ios/device_info_ios_objc.mm b/webrtc/modules/video_capture/objc/device_info_objc.mm
similarity index 86%
rename from webrtc/modules/video_capture/ios/device_info_ios_objc.mm
rename to webrtc/modules/video_capture/objc/device_info_objc.mm
index 818f8624c787091a4d956dd199fd7b35a1d3eeb6..d46fa5c3464da5b5f15d6ce0fa4af76b9e8bf3c4 100644
--- a/webrtc/modules/video_capture/ios/device_info_ios_objc.mm
+++ b/webrtc/modules/video_capture/objc/device_info_objc.mm
@@ -14,7 +14,7 @@
#import <AVFoundation/AVFoundation.h>
-#import "webrtc/modules/video_capture/ios/device_info_ios_objc.h"
+#import "webrtc/modules/video_capture/objc/device_info_objc.h"
#include "webrtc/modules/video_capture/video_capture_config.h"
@implementation DeviceInfoIosObjC
@@ -83,15 +83,6 @@
capability.rawType = webrtc::kVideoNV12;
capability.codecType = webrtc::kVideoCodecUnknown;
capability.interlaced = false;
- } else if ([preset isEqualToString:AVCaptureSessionPreset1920x1080]) {
- capability.width = 1920;
- capability.height = 1080;
- capability.maxFPS = 30;
- capability.expectedCaptureDelay =
- webrtc::videocapturemodule::kDefaultCaptureDelay;
- capability.rawType = webrtc::kVideoNV12;
- capability.codecType = webrtc::kVideoCodecUnknown;
- capability.interlaced = false;
}
return capability;
« no previous file with comments | « webrtc/modules/video_capture/objc/device_info_objc.h ('k') | webrtc/modules/video_capture/objc/rtc_video_capture_objc.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698