From patchwork Wed Dec 6 12:03:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?5b6Q56aP6ZqG?= <839789740@qq.com> X-Patchwork-Id: 44969 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9153:b0:181:818d:5e7f with SMTP id x19csp205469pzc; Wed, 6 Dec 2023 04:04:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IE+wawhtp+9fjqHvxsF1ylLpE7L/yC4j8gNDvhWRuel7FOe8WT8bgRz1cfbB8R2psydnrmT X-Received: by 2002:a17:906:34cd:b0:a1c:9083:ea77 with SMTP id h13-20020a17090634cd00b00a1c9083ea77mr1061515ejb.0.1701864254539; Wed, 06 Dec 2023 04:04:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701864254; cv=none; d=google.com; s=arc-20160816; b=z20EsR1OkYzL3yiNzz3E9NsQ6fVP/lJqUP7QMR7haWb82Y8V3uZuy6AqPd6aNfOYMC TLJXRmeNNNVqZUiPLJwdUcMj4qvivJevEYukFdAqwL1rbp3m4nabzJJSKKHyYO51AD1J ZEIAqxJlIKD6WdSl4AlBmHrwMMKFCS55GZgPiYPX4m3vwuESfpjKEUVcapjKe1x4ec9o OtVsEKRMsTB7aXadL1F7Mim/etXzfzgy/FjTsvjlih7Or4Y8RRxOai8Ex0k5z8DWZVdp C1A8Xy0tJSk+kzAGap8RdFb1zr7oBR3vGCZk9JNMZJlhSPjiflr6JGAytHFe9pjrYtlV fkPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to:from :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:date:to:message-id :delivered-to; bh=iE6bW9QaSBeFvgt8JiYG5+XwivwtDnFuM6r3eDwacl8=; fh=/QvfVIDcib8YPugs5q/sxqF0zCx8M9migilS77PcQx8=; b=ZRlk5fRBn13OvwOWsqbSb4/nhVO7BFxeDtPvciyb2sqBfPzVAQGs4N+phDraPSx3x1 lRUg11VKZvn121zZVEMOI/a9WR/Kz6CbeiHOAB/9Q4nYpiERnKiOG5E2qWo3DXF443SP pvnhVgyjAN5NkyhHs1+a4tnQExPP1hYG4jPvNHcz6KtbtKSS8OPfHNUB1nJhbyj1HGul 58UX+IMaOe3W5wy4q1CoIdxjhn/Kga0kZlE7yzkIpLkotOpyXOI5WL7vObocKOfVr8jL UbssHTVyBoIOJI9IasBJzEQIP8zGJm43MfwlsUUqPVWUpaj28NsT1aDYFoLyMQws5FEz 936Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id cw7-20020a170906c78700b00a1d32353c8bsi1087402ejb.49.2023.12.06.04.03.59; Wed, 06 Dec 2023 04:04:14 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E3ACC68CF68; Wed, 6 Dec 2023 14:03:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-209.mail.qq.com (out203-205-221-209.mail.qq.com [203.205.221.209]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C621768C67E for ; Wed, 6 Dec 2023 14:03:48 +0200 (EET) Received: from localhost.localdomain ([14.145.2.241]) by newxmesmtplogicsvrszb9-1.qq.com (NewEsmtp) with SMTP id EAA82CD; Wed, 06 Dec 2023 20:03:42 +0800 X-QQ-mid: xmsmtpt1701864222thj2u2rx4 Message-ID: X-QQ-XMAILINFO: MQ+wLuVvI2LQQ008A3Sc5hr3uM46kYJAA6ANUoMxAEeADFLpJ23Bpj82hrl3CT hptLAEJVpDC7k7GD1m7oqR1sEIlEg4Ldm8gpd2GAKgdJyecM2siHBou77WEnjNq1urRlPJ/dl2Qh haSvJrdXCYP+WnOEeDsYfe9HzkyZhrB5TZbNWRyd0Ii6m25Idub6d1sGouHpLPhErUDkPPZHaO+I lsErtnz7E312E9IZUZ14SkyG4LPMihi0WOZ63SrILSvy7s2I7bmBZRa2Y8ekyB9ggesLWfw6pE14 o4K8LtwDB4wVeaJJac4iF93lOQYtiSRhO8vQOvi0KIKVGbhw324v+JWHMDudDmkhrri2mn9nTL10 U5XVuhtExZ3ysAiu1O4uR3VO4QCeqFD3bq0NT3Ou6C+7VG+11TcBO4HY11T8rh5Fte3G1A5ogfle 2nlhBW+R/hAnnLIF5cGeDDqAc1j38ea1RPioqb1+TqfpHFETXwxAibVN/6AlXd2/IEqxpbNyaR5w RUQ8URcH9Pb+fiAEnDK2vIWrCcIuIn8WrFASW1THfG5vLUK+dVT6dJgJ8GGGUTjQqK0gDli/SdL4 qvRixeodHqNP8+ZmMlTLxCe+uHVhve7IL1Zh4FW4qRBhnrTuDsoDdicniD0GMTHs3Fw0dWsNGaOP +srE1FWwISQNweu7VsmrUDOn0/gjZ63JvudhwbMuJyBrZtRdKT6aLGyjLsva5QPrjE5rOUozc8uk lKqYZe02bMCBczTbL6ePRRo/BaZiQOy7/xi4/TbUVCqZ13qzhlrJnl0x4caKUJJ86UNobz7oUP0k oxSSdS89YkDQ69uweLjuWQPoBImhYcuee/WqqzB9xiAVhOh7C//NpcF26xLzpxeGfjlbpuQs4gi5 qYb6yWupAXjkFZQLHEetGhhUlwiyo2pK99q9B7R9w9iwbJg0dVJHvLha24ikIcXvqAb42JpAqPq3 R3197pUqKIOeSNu7YuN7W0igmqwXXUSRenenoql9o= X-QQ-XMRINFO: Nq+8W0+stu50PRdwbJxPCL0= To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Dec 2023 20:03:38 +0800 X-OQ-MSGID: <20231206120338.47764-1-839789740@qq.com> X-Mailer: git-send-email 2.32.0 (Apple Git-132) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avdevice/avfoundation: replace deprecated AVCaptureDevice X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: xufuji456 via ffmpeg-devel From: =?utf-8?b?5b6Q56aP6ZqG?= <839789740@qq.com> Reply-To: FFmpeg development discussions and patches Cc: xufuji456 <839789740@qq.com> Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: fIHZPwp7sNCw 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@qq.com> --- libavdevice/avfoundation.m | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/libavdevice/avfoundation.m b/libavdevice/avfoundation.m index 36ad834753..5ebfe89dca 100644 --- a/libavdevice/avfoundation.m +++ b/libavdevice/avfoundation.m @@ -761,6 +761,19 @@ static int get_audio_config(AVFormatContext *s) return 0; } +static NSArray* getDevicesWithMediaType(AVMediaType mediaType) { +#if ((TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MAX_ALLOWED >= 100000) || (TARGET_OS_OSX && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101500)) + AVCaptureDeviceDiscoverySession *captureDeviceDiscoverySession = + [AVCaptureDeviceDiscoverySession + discoverySessionWithDeviceTypes:@[AVCaptureDeviceTypeBuiltInWideAngleCamera] + mediaType:mediaType + position:AVCaptureDevicePositionUnspecified]; + return [captureDeviceDiscoverySession devices]; +#else + return [AVCaptureDevice devicesWithMediaType:mediaType]; +#endif +} + static int avf_read_header(AVFormatContext *s) { int ret = 0; @@ -770,8 +783,8 @@ 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 = getDevicesWithMediaType(AVMediaTypeVideo); + NSArray *devices_muxed = getDevicesWithMediaType(AVMediaTypeMuxed); ctx->num_video_devices = [devices count] + [devices_muxed count]; @@ -806,7 +819,7 @@ static int avf_read_header(AVFormatContext *s) #endif av_log(ctx, AV_LOG_INFO, "AVFoundation audio devices:\n"); - devices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeAudio]; + devices = getDevicesWithMediaType(AVMediaTypeAudio); for (AVCaptureDevice *device in devices) { const char *name = [[device localizedName] UTF8String]; int index = [devices indexOfObject:device]; @@ -930,7 +943,7 @@ static int avf_read_header(AVFormatContext *s) // get audio device if (ctx->audio_device_index >= 0) { - NSArray *devices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeAudio]; + NSArray *devices = getDevicesWithMediaType(AVMediaTypeAudio); if (ctx->audio_device_index >= [devices count]) { av_log(ctx, AV_LOG_ERROR, "Invalid audio device index\n"); @@ -943,7 +956,7 @@ 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 = getDevicesWithMediaType(AVMediaTypeAudio); for (AVCaptureDevice *device in devices) { if (!strncmp(ctx->audio_filename, [[device localizedName] UTF8String], strlen(ctx->audio_filename))) {