From patchwork Sun Jun 9 16:08:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Theo Fabi X-Patchwork-Id: 49757 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c209:0:b0:460:55fa:d5ed with SMTP id d9csp2077497vqo; Sun, 9 Jun 2024 09:09:02 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVaRjveMpMxReOeTFf8jvghzoQjq3j5nPBK9WO8FpAgYwQvAN7lN80Mr9y2DA5zEbTr0pe00c3IEl1WIRrbduBdwNhyBz+FRJny5w== X-Google-Smtp-Source: AGHT+IG4qkyPYK2yNFkO4UKRKPWMg4kct980wAIviF5R360PxaQZ+tzaj+mMjorwyVxAZ84XxXF2 X-Received: by 2002:a17:906:eea:b0:a69:edd:332d with SMTP id a640c23a62f3a-a6cd5615839mr469233566b.1.1717949342355; Sun, 09 Jun 2024 09:09:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717949342; cv=none; d=google.com; s=arc-20160816; b=YAG1zaNaVX71MGIUIXUzyhpL5pdx9Sq5WL3zwyNNs3gYGlP4eJmq1932ZzB0IQu/pp 8OveBXDtZ/l0I8I7MHwghfczOhW2fmhgevGH9iy8ZbOk7DBh+ip3P9bgmOSQ1Jv5NwXB /30W7Q1cF6fdR9XXsGgk+zw31XT9yaFrgYLM8TjeaXI9b3vDsJt0N2vNpZfjGvGt3SbO nRHcqfBN/7zVYlvf/eXSnjsQyUiTiQvtzplhlIdj7774g+IXzYKL6/NihX3ecTZmH4R0 B1fFPuWd7v5loLZMpnGTBVqv6xMg4W2/da1n73SqEUeNO0eiaeLgnEnXSJE6obWY30Nr 0eLA== 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 :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:date:message-id:mime-version:from :dkim-signature:delivered-to; bh=dZSv60SxBmwH7IM/tp3g7vQljnZLI2vM0vxo14f5EP0=; fh=ANQuGVJiXGFpLbyy+iL5wt91D8AK041gFHrX/v2dqsM=; b=x3FoH5QXJnaOAbwurqmZ4wYDze1SFNvq5n97BS3DPoSXzoWHqeAq2JDWOmT9conUqf voB5RBcSte10SCugyCyQ7A3OJIMgx2AjTCMRJQ9e1oGnqRe6IV8OYZz2Fba+NfPjJdU+ IiJCU48Rb8myyw0Su1fsAUdQRrwLalJXbsFmlxCt9GgcfKXdKJmTWC9J6qGPvJjrxl5y hBCSIUKWDUm7cppx5RnyKVw3Je9xXIK4/iPHCWBXqD4COsaPZfDi4jh4EY5FYzxp2izc xEUVAuZat9KacDnaSLy8tljby2CQVHekx2SHCyQi7Z8GIUBVyH73edBIm8xuqFfeSF3Z cG9w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=Scpj6pnN; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a6ef8bde342si210416866b.199.2024.06.09.09.09.01; Sun, 09 Jun 2024 09:09:02 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=Scpj6pnN; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EC9D068D620; Sun, 9 Jun 2024 19:08:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C4CAD68D30C for ; Sun, 9 Jun 2024 19:08:52 +0300 (EEST) Received: by mail-qk1-f178.google.com with SMTP id af79cd13be357-79524f6693dso274622185a.0 for ; Sun, 09 Jun 2024 09:08:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717949330; x=1718554130; darn=ffmpeg.org; h=to:cc:date:message-id:subject:mime-version :content-transfer-encoding:from:from:to:cc:subject:date:message-id :reply-to; bh=O3/Lory9VGCudjlALbDuDMNErggNlIbXlkX4q/xZSH4=; b=Scpj6pnNrMvRlAtqOjv/Oiq2GbaK0kG7d6K99IRoKAW6BvtyiSVBWXjij5xcz0hnUd MMRh5hZ8rVXEHJ1oo5RnZ1C0ohDNcqTbo2e+ZjvXGAPQTMJQ7ONeuPMKYCd/7666Jvx3 WvHi1W9uWU490KyLXsBOPIfUSFicjQhzoDAn4LNnaGNaEcXTJCpjyFTKJlAv5QZ5Mybg A0Zbk2NA+zz2UCNOUg6/+qwam6Q1/8EiPnJI5ZASP5lNJTzNsXX9HVB/7VB7Trw+Y8O7 1cRmtKQHUfA+n7oxIO3mJRrN5eU+Afvv1tdZbwaDHbAPHbGm3/aQ0r9ZNclO/E/pi2+6 UYAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717949330; x=1718554130; h=to:cc:date:message-id:subject:mime-version :content-transfer-encoding:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=O3/Lory9VGCudjlALbDuDMNErggNlIbXlkX4q/xZSH4=; b=pQKFELeDVXA9bsc3m372hVnEG29dteMKhfVcdBgi1TSDPkia9PXi+hD4UpDBfG9W3s b99Btn9+OPnfFRLbZyynrVc4zDSS87QkknZJLbfnyG6D8AasuSSJefY4QiK9iEsWC91p FTeAdhgomzsvWbKOXO+GzD3wYTs5aMfCjBeP0DgPv2bvi+IzWSWTCHo6Wzu6oVtetSGc uOM25o8BWPF7/T6XBYCqDszDwPxxmK3BiE/0O9A3Z8FnFJGblEDo7t77pYXDML3ErtWd 9ZEyodyj22V0f1Q0kqet2KfYtnzK/CkRtoRruNL1sUIlgkFqkYZE8/Jw8S2j8GSWPAdr Whzg== X-Gm-Message-State: AOJu0Ywy+cajLOFdwMlZrSwzkG17qGM5+RkYK4hPVTk3GGFhCu8KAEg8 BXQ5XU08wGrtD39KonVq7cEscd0ZBee89AzCxuyn6XjFABVHq69e/kkrMg== X-Received: by 2002:a05:6214:3a08:b0:6b0:778b:dabe with SMTP id 6a1803df08f44-6b0778bdbe3mr19931046d6.11.1717949329933; Sun, 09 Jun 2024 09:08:49 -0700 (PDT) Received: from smtpclient.apple (bras-base-mtrlpq0776w-grc-30-70-24-176-136.dsl.bell.ca. [70.24.176.136]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b04f6bbd06sm38227256d6.48.2024.06.09.09.08.49 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 09 Jun 2024 09:08:49 -0700 (PDT) From: Theo Fabi Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.600.7\)) Message-Id: Date: Sun, 9 Jun 2024 12:08:39 -0400 To: ffmpeg-devel@ffmpeg.org X-Mailer: Apple Mail (2.3731.600.7) Subject: [FFmpeg-devel] [PATCH] avdevice/avfoundation: add external video devices 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: , Reply-To: FFmpeg development discussions and patches Cc: Theo Fabi Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 0cdWEUVhVlzL Video devices categorized by AVFoundation as 'AVCaptureDeviceTypeExternal(Unknown)' (like USB video streams) were not recognized by libavdevice. Signed-off-by: Theo Fabi --- libavdevice/avfoundation.m | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavdevice/avfoundation.m b/libavdevice/avfoundation.m index e558ad7d90..c5a09c6563 100644 --- a/libavdevice/avfoundation.m +++ b/libavdevice/avfoundation.m @@ -788,6 +788,9 @@ static NSArray* getDevicesWithMediaType(AVMediaType mediaType) { #endif #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 170000 || (TARGET_OS_OSX && __MAC_OS_X_VERSION_MIN_REQUIRED >= 140000)) [deviceTypes addObject: AVCaptureDeviceTypeContinuityCamera]; + [deviceTypes addObject: AVCaptureDeviceTypeExternal]; + #elif (TARGET_OS_OSX && __MAC_OS_X_VERSION_MIN_REQUIRED < 140000) + [deviceTypes addObject: AVCaptureDeviceTypeExternalUnknown]; #endif } else if (mediaType == AVMediaTypeAudio) { #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 170000 || (TARGET_OS_OSX && __MAC_OS_X_VERSION_MIN_REQUIRED >= 140000))