Merge pull request #2361 from alekcac:ios_camera_changes

6f19ef86 · Roman Donchenko · OpenCV Buildbot · 5cb2d1c2 · 77df5948 · 6f19ef86
Commit 6f19ef86 authored Feb 18, 2014 by Roman Donchenko Committed by OpenCV Buildbot Feb 18, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 5 deletions

cap_ios_abstract_camera.mm modules/highgui/src/cap_ios_abstract_camera.mm +14 -5

No files found.
--- a/modules/highgui/src/cap_ios_abstract_camera.mm
+++ b/modules/highgui/src/cap_ios_abstract_camera.mm
@@ -278,8 +278,20 @@
 {
    self.captureVideoPreviewLayer = [[AVCaptureVideoPreviewLayer alloc] initWithSession:self.captureSession];

-    if ([self.captureVideoPreviewLayer isOrientationSupported]) {
-        [self.captureVideoPreviewLayer setOrientation:self.defaultAVCaptureVideoOrientation];
+    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];
+        }
    }

    if (parentView != nil) {
@@ -290,9 +302,6 @@
    NSLog(@"[Camera] created AVCaptureVideoPreviewLayer");
 }

-
-
-
 - (void)setDesiredCameraPosition:(AVCaptureDevicePosition)desiredPosition;
 {
    for (AVCaptureDevice *device in [AVCaptureDevice devicesWithMediaType:AVMediaTypeVideo]) {