mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-13 04:52:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add target conditionals for Mac Catalyst

Browse Source
This commit is contained in:
Chris Ballinger 2020-05-14 12:48:37 -07:00 committed by Chris Ballinger
parent de720ac34a
commit 220df8252d
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/videoio/src/cap_avfoundation.mm
View File

@ -383,7 +383,7 @@ int CvCaptureCAM::startCaptureDevice(int cameraNum) {
[mCaptureDecompressedVideoOutput setVideoSettings:pixelBufferOptions]; [mCaptureDecompressedVideoOutput setVideoSettings:pixelBufferOptions];
mCaptureDecompressedVideoOutput.alwaysDiscardsLateVideoFrames = YES; mCaptureDecompressedVideoOutput.alwaysDiscardsLateVideoFrames = YES;
#if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR #if (TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR) && !TARGET_OS_MACCATALYST
mCaptureDecompressedVideoOutput.minFrameDuration = CMTimeMake(1, 30); mCaptureDecompressedVideoOutput.minFrameDuration = CMTimeMake(1, 30);
#endif #endif

2
modules/videoio/src/cap_ios_abstract_camera.mm
View File

@ -299,11 +299,13 @@
} }
else else
{ {
#if !TARGET_OS_MACCATALYST
// Deprecated in 6.0; here for backward compatibility // Deprecated in 6.0; here for backward compatibility
if ([self.captureVideoPreviewLayer isOrientationSupported]) if ([self.captureVideoPreviewLayer isOrientationSupported])
{ {
[self.captureVideoPreviewLayer setOrientation:self.defaultAVCaptureVideoOrientation]; [self.captureVideoPreviewLayer setOrientation:self.defaultAVCaptureVideoOrientation];
} }
#endif
} }
if (parentView != nil) { if (parentView != nil) {