generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2361 from alekcac:ios_camera_changes

Browse Source
This commit is contained in:
Roman Donchenko 2014-02-18 15:44:56 +04:00 committed by OpenCV Buildbot
commit 6f19ef8631
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
modules/highgui/src/cap_ios_abstract_camera.mm
View File

@ -278,9 +278,21 @@
{ {
self.captureVideoPreviewLayer = [[AVCaptureVideoPreviewLayer alloc] initWithSession:self.captureSession]; self.captureVideoPreviewLayer = [[AVCaptureVideoPreviewLayer alloc] initWithSession:self.captureSession];
if ([self.captureVideoPreviewLayer isOrientationSupported]) { if ([self.captureVideoPreviewLayer respondsToSelector:@selector(connection)])
{
if ([self.captureVideoPreviewLayer.connection isVideoOrientationSupported])
{
[self.captureVideoPreviewLayer.connection setVideoOrientation:self.defaultAVCaptureVideoOrientation];
}
}
else
{
// Deprecated in 6.0; here for backward compatibility
if ([self.captureVideoPreviewLayer isOrientationSupported])
{
[self.captureVideoPreviewLayer setOrientation:self.defaultAVCaptureVideoOrientation]; [self.captureVideoPreviewLayer setOrientation:self.defaultAVCaptureVideoOrientation];
} }
}
if (parentView != nil) { if (parentView != nil) {
self.captureVideoPreviewLayer.frame = self.parentView.bounds; self.captureVideoPreviewLayer.frame = self.parentView.bounds;
@ -290,9 +302,6 @@
NSLog(@"[Camera] created AVCaptureVideoPreviewLayer"); NSLog(@"[Camera] created AVCaptureVideoPreviewLayer");
} }
- (void)setDesiredCameraPosition:(AVCaptureDevicePosition)desiredPosition; - (void)setDesiredCameraPosition:(AVCaptureDevicePosition)desiredPosition;
{ {
for (AVCaptureDevice *device in [AVCaptureDevice devicesWithMediaType:AVMediaTypeVideo]) { for (AVCaptureDevice *device in [AVCaptureDevice devicesWithMediaType:AVMediaTypeVideo]) {