[FFmpeg-devel] [PATCH] avdevice/avfoundation: replace AVCaptureDevice with new api

[xufuji456]

Building with iOS platform, the compiler has a warning: "'devicesWithMediaType:' is deprecated: first deprecated in iOS 10.0 - Use AVCaptureDeviceDiscoverySession instead"

Signed-off-by: xufuji456 <839789740 at qq.com>
---
 libavdevice/avfoundation.m | 81 +++++++++++++++++++++++++++++++++++---
 1 file changed, 76 insertions(+), 5 deletions(-)

diff --git a/libavdevice/avfoundation.m b/libavdevice/avfoundation.m
index 36ad834753..668c726eb7 100644
--- a/libavdevice/avfoundation.m
+++ b/libavdevice/avfoundation.m
@@ -770,8 +770,38 @@ static int avf_read_header(AVFormatContext *s)
     AVCaptureDevice *video_device = nil;
     AVCaptureDevice *audio_device = nil;
     // Find capture device
-    NSArray *devices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeVideo];
-    NSArray *devices_muxed = [AVCaptureDevice devicesWithMediaType:AVMediaTypeMuxed];
+    NSArray *devices = nil;
+    NSArray *devices_muxed = nil;
+
+    if (TARGET_OS_IPHONE) {
+        if (@available(iOS 10.0, *)) {
+            AVCaptureDeviceDiscoverySession *captureDeviceDiscoverySession =
+                        [AVCaptureDeviceDiscoverySession
+                        discoverySessionWithDeviceTypes:@[AVCaptureDeviceTypeBuiltInWideAngleCamera]
+                                              mediaType:AVMediaTypeVideo
+                                               position:AVCaptureDevicePositionUnspecified];
+            devices = [captureDeviceDiscoverySession devices];
+        } else {
+            devices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeVideo];
+        }
+    } else {
+        devices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeVideo];
+    }
+
+    if (TARGET_OS_IPHONE) {
+        if (@available(iOS 10.0, *)) {
+            AVCaptureDeviceDiscoverySession *captureDeviceDiscoverySession =
+                        [AVCaptureDeviceDiscoverySession
+                        discoverySessionWithDeviceTypes:@[AVCaptureDeviceTypeBuiltInWideAngleCamera]
+                                              mediaType:AVMediaTypeMuxed
+                                               position:AVCaptureDevicePositionUnspecified];
+            devices_muxed = [captureDeviceDiscoverySession devices];
+        } else {
+            devices_muxed = [AVCaptureDevice devicesWithMediaType:AVMediaTypeMuxed];
+        }
+    } else {
+        devices_muxed = [AVCaptureDevice devicesWithMediaType:AVMediaTypeMuxed];
+    }
 
     ctx->num_video_devices = [devices count] + [devices_muxed count];
 
@@ -806,7 +836,20 @@ static int avf_read_header(AVFormatContext *s)
 #endif
 
         av_log(ctx, AV_LOG_INFO, "AVFoundation audio devices:\n");
-        devices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeAudio];
+        if (TARGET_OS_IPHONE) {
+            if (@available(iOS 10.0, *)) {
+                AVCaptureDeviceDiscoverySession *captureDeviceDiscoverySession =
+                            [AVCaptureDeviceDiscoverySession
+                            discoverySessionWithDeviceTypes:@[AVCaptureDeviceTypeBuiltInWideAngleCamera]
+                                                  mediaType:AVMediaTypeAudio
+                                                   position:AVCaptureDevicePositionUnspecified];
+                devices = [captureDeviceDiscoverySession devices];
+            } else {
+                devices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeAudio];
+            }
+        } else {
+            devices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeAudio];
+        }
         for (AVCaptureDevice *device in devices) {
             const char *name = [[device localizedName] UTF8String];
             int index  = [devices indexOfObject:device];
@@ -930,7 +973,21 @@ static int avf_read_header(AVFormatContext *s)
 
     // get audio device
     if (ctx->audio_device_index >= 0) {
-        NSArray *devices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeAudio];
+        NSArray *devices = nil;
+        if (TARGET_OS_IPHONE) {
+            if (@available(iOS 10.0, *)) {
+                AVCaptureDeviceDiscoverySession *captureDeviceDiscoverySession =
+                            [AVCaptureDeviceDiscoverySession
+                            discoverySessionWithDeviceTypes:@[AVCaptureDeviceTypeBuiltInWideAngleCamera]
+                                                  mediaType:AVMediaTypeAudio
+                                                   position:AVCaptureDevicePositionUnspecified];
+                devices = [captureDeviceDiscoverySession devices];
+            } else {
+                devices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeAudio];
+            }
+        } else {
+            devices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeAudio];
+        }
 
         if (ctx->audio_device_index >= [devices count]) {
             av_log(ctx, AV_LOG_ERROR, "Invalid audio device index\n");
@@ -943,7 +1000,21 @@ static int avf_read_header(AVFormatContext *s)
         if (!strncmp(ctx->audio_filename, "default", 7)) {
             audio_device = [AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeAudio];
         } else {
-        NSArray *devices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeAudio];
+        NSArray *devices = nil;
+        if (TARGET_OS_IPHONE) {
+            if (@available(iOS 10.0, *)) {
+                AVCaptureDeviceDiscoverySession *captureDeviceDiscoverySession =
+                            [AVCaptureDeviceDiscoverySession
+                            discoverySessionWithDeviceTypes:@[AVCaptureDeviceTypeBuiltInWideAngleCamera]
+                                                  mediaType:AVMediaTypeAudio
+                                                   position:AVCaptureDevicePositionUnspecified];
+                devices = [captureDeviceDiscoverySession devices];
+            } else {
+                devices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeAudio];
+            }
+        } else {
+            devices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeAudio];
+        }
 
         for (AVCaptureDevice *device in devices) {
             if (!strncmp(ctx->audio_filename, [[device localizedName] UTF8String], strlen(ctx->audio_filename))) {
-- 
2.32.0 (Apple Git-132)