potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03:03 +04:00
Code Packages Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2020-05-22 19:06:42 +00:00
parent e96a58f091 a9b030591b
commit 21e28adb87
79 changed files with 1054 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/videoio/src/cap_avfoundation.mm
+1 -1
View File
@@ -392,7 +392,7 @@ int CvCaptureCAM::startCaptureDevice(int cameraNum) {
[mCaptureDecompressedVideoOutput setVideoSettings:pixelBufferOptions];
mCaptureDecompressedVideoOutput.alwaysDiscardsLateVideoFrames = YES;
#if (TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR) && !TARGET_OS_MACCATALYST
#if (TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR) && (!defined(TARGET_OS_MACCATALYST) || !TARGET_OS_MACCATALYST)
mCaptureDecompressedVideoOutput.minFrameDuration = CMTimeMake(1, 30);
#endif
modules/videoio/src/cap_ios_abstract_camera.mm
+1 -1
View File
@@ -299,7 +299,7 @@
}
else
{
#if !TARGET_OS_MACCATALYST
#if (!defined(TARGET_OS_MACCATALYST) || !TARGET_OS_MACCATALYST)
// Deprecated in 6.0; here for backward compatibility
if ([self.captureVideoPreviewLayer isOrientationSupported])
{