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

2026-07-30 07:43:03 +04:00 · 2022-12-18 02:16:17 +00:00
parent 6db9fcbc30 07ed5e5346
commit 420db56ffd
11 changed files with 124 additions and 38 deletions
@@ -389,6 +389,15 @@ int CvCaptureCAM::startCaptureDevice(int cameraNum) {
        return 0;
    }

+    // Preserve devices ordering on the system
+    // see AVCaptureDevice::uniqueID property documentation for more info
+    devices = [devices
+        sortedArrayUsingComparator:^NSComparisonResult(AVCaptureDevice *d1,
+                                                     AVCaptureDevice *d2) {
+          return [d1.uniqueID compare:d2.uniqueID];
+        }
+    ];
+
    mCaptureDevice = devices[cameraNum];

    if ( ! mCaptureDevice ) {