Changeset 5454 for pjproject

Timestamp:

Oct 7, 2016 5:58:54 AM (8 years ago)

Author:

ming

Message:

Re #1941: Support for AVCaptureDeviceDiscoverySession to replace the deprecated [AVCaptureDevice devices] in iOS 10.

File:

• pjproject/trunk/pjmedia/src/pjmedia-videodev/darwin_dev.m (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia-videodev/darwin_dev.m

@@ -294 +294 @@
     first_idx = qf->dev_count;
     if (NSClassFromString(@"AVCaptureSession")) {
-        for (AVCaptureDevice *device in [AVCaptureDevice devices]) {
+        NSArray<AVCaptureDevice *> *dev_list;
+
+#if TARGET_OS_IPHONE && defined(__IPHONE_10_0)
+        if (NSClassFromString(@"AVCaptureDeviceTypeBuiltInWideAngleCamera")) {
+            /* Starting in iOS 10, [AVCaptureDevice devices] is deprecated
+             * and replaced by AVCaptureDeviceDiscoverySession.
+             */
+            AVCaptureDeviceDiscoverySession *dds;
+            NSArray<AVCaptureDeviceType> *dev_types =
+                @[AVCaptureDeviceTypeBuiltInWideAngleCamera,
+                  AVCaptureDeviceTypeBuiltInDuoCamera,
+                  AVCaptureDeviceTypeBuiltInTelephotoCamera];
+
+            dds = [AVCaptureDeviceDiscoverySession
+                   discoverySessionWithDeviceTypes:dev_types
+                   mediaType:AVMediaTypeVideo
+                   position:AVCaptureDevicePositionUnspecified];
+
+            dev_list = [dds devices];
+        } else {
+            dev_list = [AVCaptureDevice devices];
+        }
+#else
+        dev_list = [AVCaptureDevice devices];
+#endif
+
+        for (AVCaptureDevice *device in dev_list) {
             if (![device hasMediaType:AVMediaTypeVideo] ||
                 qf->dev_count >= MAX_DEV_COUNT)