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

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

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.mm
diff --git a/webrtc/modules/video_capture/ios/rtc_video_capture_ios_objc.mm b/webrtc/modules/video_capture/objc/rtc_video_capture_objc.mm
similarity index 79%
rename from webrtc/modules/video_capture/ios/rtc_video_capture_ios_objc.mm
rename to webrtc/modules/video_capture/objc/rtc_video_capture_objc.mm
index e36c83bad9485517b69f9acea5ab5fde74ba3b0e..a2af4afc0c4eddbf9e51ac2cdf3378ff2e07820a 100644
--- a/webrtc/modules/video_capture/ios/rtc_video_capture_ios_objc.mm
+++ b/webrtc/modules/video_capture/objc/rtc_video_capture_objc.mm
@@ -12,10 +12,13 @@
#error "This file requires ARC support."
#endif
+#import <AVFoundation/AVFoundation.h>
+#ifdef WEBRTC_IOS
#import <UIKit/UIKit.h>
+#endif
-#import "webrtc/modules/video_capture/ios/device_info_ios_objc.h"
-#import "webrtc/modules/video_capture/ios/rtc_video_capture_ios_objc.h"
+#import "webrtc/modules/video_capture/objc/device_info_objc.h"
+#import "webrtc/modules/video_capture/objc/rtc_video_capture_objc.h"
#include "webrtc/system_wrappers/include/trace.h"
@@ -72,15 +75,12 @@ using namespace webrtc::videocapturemodule;
if ([_captureSession canAddOutput:captureOutput]) {
[_captureSession addOutput:captureOutput];
} else {
- WEBRTC_TRACE(kTraceError,
- kTraceVideoCapture,
- _captureId,
+ WEBRTC_TRACE(kTraceError, kTraceVideoCapture, _captureId,
"%s:%s:%d Could not add output to AVCaptureSession ",
- __FILE__,
- __FUNCTION__,
- __LINE__);
+ __FILE__, __FUNCTION__, __LINE__);
}
+#ifdef WEBRTC_IOS
[[UIDevice currentDevice] beginGeneratingDeviceOrientationNotifications];
NSNotificationCenter* notify = [NSNotificationCenter defaultCenter];
@@ -92,6 +92,7 @@ using namespace webrtc::videocapturemodule;
selector:@selector(deviceOrientationDidChange:)
name:UIDeviceOrientationDidChangeNotification
object:nil];
+#endif
}
return self;
@@ -144,12 +145,7 @@ using namespace webrtc::videocapturemodule;
return NO;
}
- if ([_captureSession canSetSessionPreset:AVCaptureSessionPreset1920x1080]) {
- if (capability.width > 1920 || capability.height > 1080) {
- return NO;
- }
- } else if ([_captureSession
- canSetSessionPreset:AVCaptureSessionPreset1280x720]) {
+ if ([_captureSession canSetSessionPreset:AVCaptureSessionPreset1280x720]) {
if (capability.width > 1280 || capability.height > 720) {
return NO;
}
@@ -177,9 +173,10 @@ using namespace webrtc::videocapturemodule;
_orientationHasChanged = NO;
_captureChanging = YES;
- dispatch_async(
- dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0),
- ^(void) { [self startCaptureInBackgroundWithOutput:currentOutput]; });
+ dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0),
+ ^{
+ [self startCaptureInBackgroundWithOutput:currentOutput];
+ });
return YES;
}
@@ -188,13 +185,10 @@ using namespace webrtc::videocapturemodule;
}
- (void)startCaptureInBackgroundWithOutput:
- (AVCaptureVideoDataOutput*)currentOutput {
+ (AVCaptureVideoDataOutput*)currentOutput {
NSString* captureQuality =
[NSString stringWithString:AVCaptureSessionPresetLow];
- if (_capability.width >= 1920 || _capability.height >= 1080) {
- captureQuality =
- [NSString stringWithString:AVCaptureSessionPreset1920x1080];
- } else if (_capability.width >= 1280 || _capability.height >= 720) {
+ if (_capability.width >= 1280 || _capability.height >= 720) {
captureQuality = [NSString stringWithString:AVCaptureSessionPreset1280x720];
} else if (_capability.width >= 640 || _capability.height >= 480) {
captureQuality = [NSString stringWithString:AVCaptureSessionPreset640x480];
@@ -208,30 +202,6 @@ using namespace webrtc::videocapturemodule;
// picture resolution
[_captureSession setSessionPreset:captureQuality];
- // take care of capture framerate now
- NSArray* sessionInputs = _captureSession.inputs;
- AVCaptureDeviceInput* deviceInput = [sessionInputs count] > 0 ?
- sessionInputs[0] : nil;
- AVCaptureDevice* inputDevice = deviceInput.device;
- if (inputDevice) {
- AVCaptureDeviceFormat* activeFormat = inputDevice.activeFormat;
- NSArray* supportedRanges = activeFormat.videoSupportedFrameRateRanges;
- AVFrameRateRange* targetRange = [supportedRanges count] > 0 ?
- supportedRanges[0] : nil;
- // Find the largest supported framerate less than capability maxFPS.
- for (AVFrameRateRange* range in supportedRanges) {
- if (range.maxFrameRate <= _capability.maxFPS &&
- targetRange.maxFrameRate <= range.maxFrameRate) {
- targetRange = range;
- }
- }
- if (targetRange && [inputDevice lockForConfiguration:NULL]) {
- inputDevice.activeVideoMinFrameDuration = targetRange.minFrameDuration;
- inputDevice.activeVideoMaxFrameDuration = targetRange.minFrameDuration;
- [inputDevice unlockForConfiguration];
- }
- }
-
_connection = [currentOutput connectionWithMediaType:AVMediaTypeVideo];
[self setRelativeVideoOrientation];
@@ -246,49 +216,47 @@ using namespace webrtc::videocapturemodule;
if (!_connection.supportsVideoOrientation) {
return;
}
-
+#ifndef WEBRTC_IOS
+ _connection.videoOrientation = AVCaptureVideoOrientationLandscapeRight;
+ return;
+#else
switch ([UIDevice currentDevice].orientation) {
case UIDeviceOrientationPortrait:
- _connection.videoOrientation =
- AVCaptureVideoOrientationPortrait;
+ _connection.videoOrientation = AVCaptureVideoOrientationPortrait;
break;
case UIDeviceOrientationPortraitUpsideDown:
_connection.videoOrientation =
AVCaptureVideoOrientationPortraitUpsideDown;
break;
case UIDeviceOrientationLandscapeLeft:
- _connection.videoOrientation =
- AVCaptureVideoOrientationLandscapeRight;
+ _connection.videoOrientation = AVCaptureVideoOrientationLandscapeRight;
break;
case UIDeviceOrientationLandscapeRight:
- _connection.videoOrientation =
- AVCaptureVideoOrientationLandscapeLeft;
+ _connection.videoOrientation = AVCaptureVideoOrientationLandscapeLeft;
break;
case UIDeviceOrientationFaceUp:
case UIDeviceOrientationFaceDown:
case UIDeviceOrientationUnknown:
if (!_orientationHasChanged) {
- _connection.videoOrientation =
- AVCaptureVideoOrientationPortrait;
+ _connection.videoOrientation = AVCaptureVideoOrientationPortrait;
}
break;
}
+#endif
}
- (void)onVideoError:(NSNotification*)notification {
NSLog(@"onVideoError: %@", notification);
// TODO(sjlee): make the specific error handling with this notification.
- WEBRTC_TRACE(kTraceError,
- kTraceVideoCapture,
- _captureId,
- "%s:%s:%d [AVCaptureSession startRunning] error.",
- __FILE__,
- __FUNCTION__,
- __LINE__);
+ WEBRTC_TRACE(kTraceError, kTraceVideoCapture, _captureId,
+ "%s:%s:%d [AVCaptureSession startRunning] error.", __FILE__,
+ __FUNCTION__, __LINE__);
}
- (BOOL)stopCapture {
+#ifdef WEBRTC_IOS
[[UIDevice currentDevice] endGeneratingDeviceOrientationNotifications];
+#endif
_orientationHasChanged = NO;
[self waitForCaptureChangeToFinish];
[self directOutputToNil];
@@ -299,7 +267,9 @@ using namespace webrtc::videocapturemodule;
_captureChanging = YES;
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0),
- ^(void) { [self stopCaptureInBackground]; });
+ ^(void) {
+ [self stopCaptureInBackground];
+ });
return YES;
}
@@ -342,14 +312,9 @@ using namespace webrtc::videocapturemodule;
if (!newCaptureInput) {
const char* errorMessage = [[deviceError localizedDescription] UTF8String];
- WEBRTC_TRACE(kTraceError,
- kTraceVideoCapture,
- _captureId,
- "%s:%s:%d deviceInputWithDevice error:%s",
- __FILE__,
- __FUNCTION__,
- __LINE__,
- errorMessage);
+ WEBRTC_TRACE(kTraceError, kTraceVideoCapture, _captureId,
+ "%s:%s:%d deviceInputWithDevice error:%s", __FILE__,
+ __FUNCTION__, __LINE__, errorMessage);
return NO;
}
« no previous file with comments | « webrtc/modules/video_capture/objc/rtc_video_capture_objc.h ('k') | webrtc/modules/video_capture/objc/video_capture.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698