From patchwork Mon Jul 15 06:51:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: patches X-Patchwork-Id: 50541 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:2298:b0:482:c625:d099 with SMTP id fp24csp2076177vqb; Sun, 14 Jul 2024 23:51:41 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWCKae2X+nYlE2mfirjByraM8Dp8Q0XDu6zcIYP8pIs79v7kCYMVCkCVkY+qXYXDQvaVvz01lWMDJ9ZUEURf8sDPO4X/dYyE9vn3A== X-Google-Smtp-Source: AGHT+IFxVydmsbqGa2OdLtUZGZsctz2tLt6QxHLnh4wA8bfFgoufGScEbMZx0k655YCzp/irH973 X-Received: by 2002:a17:907:bb85:b0:a77:bfca:da57 with SMTP id a640c23a62f3a-a780b705441mr1159964466b.44.1721026301012; Sun, 14 Jul 2024 23:51:41 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a79bc7f7e51si227961366b.579.2024.07.14.23.51.40; Sun, 14 Jul 2024 23:51:40 -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; arc=fail (body hash mismatch); 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 91AD768DA31; Mon, 15 Jul 2024 09:51:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2109.outbound.protection.outlook.com [40.107.21.109]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2BD7868D109 for ; Mon, 15 Jul 2024 09:51:31 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ety40vGnMm32itTrQ7PQQxLRq0lX7575cXLhR6Kk7oZ2Ni6keW7SoZEP2xxveKCcxpkLk831IXtLx3/1iCeK++R4UE8dvvV4gazr/xN/luPZVfLT69UjzIasR5twTv2ApNPWNJ6XhlgakFx6Q0uFi+Uevau2Dw07TmnSRoLJk2tsGCTWTgs+j//Uhei7dD1S9ILrkNI1mR+cZDgl7DAAfRhbNqRrRe53GJn8O+UV/evv7bcenECAcxIkmOlmhnckTaKNYAbQe2mj/lZoaEbXvPVNKNxkMUfCgy9O/wSjkWzJEGp/ICzpXq92qGyededQx1NFW5lxhYCBO25dCbGaOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Vudnf5JDcsGYrf4jnKyvP03z6h1G5Yq4gGBE9FUQRQ4=; b=qz0pYkvAL/Kq6trItY3p6YZx4cJT8dd0DEbWfoa8t5EsrbsK4mmi4wHzHgAJSVW0JFst3tQwDShng9S0AvPxUzB69g+lemKdLLEOs8gHp02fYhd0d6/26qJkV/wzIhbizPt5w5GF/BFeDEJw3pCjI9pv26YSQE8G7E1MZNn35PasJZU/2AuPGx/L7/YtJKHROMiuVsZlKW3DifoI34DRxbIBLPMq/HcaNkfoIan6e3DtHYEDWQSE4421uV9iCALa5LckipH9onz75Rd9gLqUZVj+AeU3HLN7LrCgcW2tVhShotMnphFtYjzY3D5TDrV+9PD9mvRXgX3NQYbTit8taQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vector.com; dmarc=pass action=none header.from=vector.com; dkim=pass header.d=vector.com; arc=none Received: from DBBPR01MB10433.eurprd01.prod.exchangelabs.com (2603:10a6:10:52e::8) by AM7PR01MB6627.eurprd01.prod.exchangelabs.com (2603:10a6:20b:1a2::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.28; Mon, 15 Jul 2024 06:51:29 +0000 Received: from DBBPR01MB10433.eurprd01.prod.exchangelabs.com ([fe80::6f1a:da6b:20ac:ead0]) by DBBPR01MB10433.eurprd01.prod.exchangelabs.com ([fe80::6f1a:da6b:20ac:ead0%6]) with mapi id 15.20.7762.027; Mon, 15 Jul 2024 06:51:29 +0000 To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] avdevice/dshow: Don't skip audio devices if no video device is present Thread-Index: AdrWgqE7LkNc5e42Twyh0YldT1Y+DQ== Date: Mon, 15 Jul 2024 06:51:29 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DBBPR01MB10433:EE_|AM7PR01MB6627:EE_ x-ms-office365-filtering-correlation-id: 4083c095-46b6-420c-e513-08dca49a8ddc x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; ARA:13230040|376014|366016|1800799024|38070700018; x-microsoft-antispam-message-info: gMjQbDErx15KwFotpAiH82kJKqkrjIOlgrcpXHDTaRaTC1uJKqHtkgq3pyBV90XY8wPCRWK9IS/cPLbP51fhZfTOT6VzbOGnG04ZeL4I/0ChOLppAmFSptUVkHGoJUzH34lEb5Slpkq1VMx81YBjUXGVuvg/ugDkCU+5+Nk6q6uv7EQ7NEBipx6XnzVBBz9CoGNQvzPv5B5HDaVLwRQSyLSE5sOqsyu6LK8SRFdoIVchYu723lVn29l826qXkN3fJ+dBq2+gONwfcG+Fyj4cMMZ1GjFXysrxZUNsuokdUtvI9orYwkiP1vYDAWlQzZBkp1kpsmaP0/cKUlT3gCyKnZLUUHzApxpDU/5k3b0RqZ2stjb11q6+c7oTzWOR5eRFx0dBX11pF7CEzmjk7ctSGwLAc1KTPPNcZOaZEsqi8Nya3q1JukIt+nXl6BND3Q3vZpHsPHm5hoMZm2Ifx0tBs3PrlyB2NDfRsTk/Oid1cJul3JVMcTnhvRajF5uDHhKAXTssnatd4wICHQxK+vBEtz/IbfjxrE1UnrTgX5JBwJ98nwp34ClzUrXNauUudQiBy6BN9x+0w2RubET9nTv/1xchrgMe5Vx3vQJV9eWB6LUiYq1EbOq15tYYYB5GcGKw7FcMr52viOJliEamFcOOzJIog/ju5iLZlWY7bAj/z7pst52m81M6siGpYvDC6MsEKbac5aeXZYpymE6q6CbJCXfe3EH81J9Nws5QpXLmC4dg4k+ssgD+4WmxWQbdJMUumOoyI3uu+gVksjFqoCcIs1wpxYKT1OATrOK46rmWaANlAKkYJMEJDNQbNfKjHoRrSCCdgA2m22Lqe5ZbLF+MOLezWAEFnSFa9Clwwr33PhcT7cmYtaafGLed8aAqQnzMAahy4ArgiTXtX0wvUjnXwqoEjY35D5Z93h/pbhNm74cGFknRslfqHUxsmDeau8/CdAbKoT8im1/I3cEAeI417prQFgezYpjOdNrn4iq4MWZslUzMm5TcwI5dXDRT9aY57wRdze8hhSH1wad9GpdGQwRaU8dNpv9zVAoXtUEmqGno2FUwhzWHeMSi12fb/LAWbt1GYTUpKmMJH9cE6PCpgS+2WAEsDptYeOdhTELJCgPe9H8N3NDNOU3oSrXs2ib7Qmu1wk9pacRvniTwt5RJa1wVKijcyDGjjyyHvnTh7d9c3LZ9WCARocMlYgwuGYqms5Bm4kY01KEcV47nT2BI53OyQVjHYgOg9jJ2E0Fb2YPuxJGUyPNPm8IdtpIhCPX4UocAa+bkg+52jP+SrEnrZY3NOKTtYQwTaW5q7/aMD869sjhO4wk61Yccb/YACx+nOQC4K56K8KcI6VnhLO2OkxjhhUG905n/BVBFr8xmKEWD2lPgSAQTnB9q7J9y7ASedKpa5604UZGrqwVp/itTCQ== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DBBPR01MB10433.eurprd01.prod.exchangelabs.com; PTR:; CAT:NONE; SFS:(13230040)(376014)(366016)(1800799024)(38070700018); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: 4eymGC4hOfp7XCGrFyMI2AuecyyCA1l8aR9rJ0b+zPz46mqLT5FiWTECwM6iXeR+B7B3oVHtxiGWDkxaxRgdLfOVS/Aorvz1HXu2WRj9Z5P9T2a66ldAJNN1a0T+ABOvM08eoePI8xbneQyDAD7EjgBrx31hPwJO9PHPXAD7q+d/v3GZLO6gAKtZoCAyS6epYoHaoeD/vFferp6Em+LXhXRpFDHxzmSGYRGQRJLsHWuW4I6edkCUcqeW/FZA6pNNnhjT5g3ZXRUiDU8XXDqVqZqzZVp33LowXXd2naxMisiD3SqPj7VtPAeBeMs6qrxdow47i78oQ5MSQgqPoQm3KwcglQZQHded6YHQLAr29yCSA1Pfz6OCHqZw8e1EKZER6wl+a+aqKtIb8NDsWDqT4PZKKYHuaqzt74Tl64QevtZCfzPQHLHnxj+u+H1r5nF8vL3vFrECAO/kXOjUkd3k3mnkjSMvE8tOX2ydyO8f2T5EVMHZhYVpuh9ky6B15uAERpL653k6xAzdbY3wlCBnITGk/nu+pDWjlrI8bVsmosuU3QDOsxx2ZVFIYzrosMN+lj498d5uX4Fe9n8PXkJSMGmY/GDIz/iypSHKMFl71FQXQFZcSWVJlIlE67r4mCbCw/3aIugp+TGD/2aXLalogzZ6S47EFKGnGwBrghXvHgpeHzfxcL/mxsz0gcMB5OYeQ5S+ZyI267J/C5iI8pDjdSkiqQgPdGTQza0Z/XYA//tLEANgZzevk+Y4rCkFpS1o3/wXwcqDqPqL2wnFbYv5auXrNnIjgtyrujpagAF9sbSiBVw1NGs2OeDkwj7MOXpRZ9yrtP1tp+2aynS4m7PToze5QSVBh7p2Kv6SMReUprJek0aoUFw08eYo+oZNeHpE064Ule46MEYYRCg7FGMXwjY7L0vwMJVLcFyFt6JAA4LdXNxOWHDb+R86uZRPqRs4U0k6/HAZlcnw+cDGH01KgDvIb5xVqTEei1j6TQ/F0BsHLdDQ2LXcIS1SRhiwXVsMRuiMx9d1B2t5rkc/idY5EWAWI8FqVKjrmzRlQ9mwoUUObuFqKctuRsl49MW2xnwvun8yVl6pVlbkxEzZY1fwCJOKG0Kfob88uNmh7/JxpVwjFlb1TMQgkNFjMPhqc36nXtoE7ebdrjYJLx8rfffCep45jY10CdkEwo0RDWv2TS/oKYNS+Ogf8XBNH264vxEAKeurJ/W7zi7ngrjjpFgw3I8WOBrtc+k7CCJMfLhzjZKLfV9+D0DM5Fjz/BIxlbMAbL/rgjMWw6Ojzs+ml0N6T1YXhXbUEMRwlZGZR0kaJ9IxUQWU+gsTTFAfIZcQCQgVMDbDnayvjof1kguEG/Kle/sfM7c5Kq3SFSolLBYvgXrKJLNoYbcgEnZjATEzCAG9eGapVkLI72aUhs4JnVQ4L8dSbnNKUZKSQl7T8R/ehgDOJfg6E1Kqbi/xr2n1KC26J8r4NVuiQkmmCnLJP8pc938BVdhQELA3Y93UIKtGzv3t4GLKL3FkNfsCT6C74c3ATE4lI7EUrsdJms+9MK7/SZLiM0J2IFSpRaxDcQaYvR0s5FxhgBpurOG33I2DQBl3avL12jdCTA3h23pqcFkg7w== MIME-Version: 1.0 X-OriginatorOrg: vector.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DBBPR01MB10433.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4083c095-46b6-420c-e513-08dca49a8ddc X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Jul 2024 06:51:29.1515 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: c844b2b9-7a68-473f-b386-e2e1b968279d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: v3EalwcMPxP/T1BS8z9XCZ+qGDoK2T2IDUnHUJ9HCAi70XlW4CTLfi1EmRH+1QU6qBWp8i1CFSCIkdR1Sd8HFe/v7UfQ0o2TW4JH7ogaaMg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR01MB6627 Subject: [FFmpeg-devel] [PATCH] avdevice/dshow: Don't skip audio devices if no video device is present 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: patches via ffmpeg-devel From: patches Reply-To: FFmpeg development discussions and patches Cc: patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 85QmOijGe3DJ The search of the current DirectShow device list has been customized so that audio devices are always found even if no video device is connected. Signed-off-by: Jens Frederich --- libavdevice/dshow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index 403e56fe13..57d8e1c0af 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -645,7 +645,7 @@ static int dshow_get_device_list(AVFormatContext *avctx, AVDeviceInfoList *devic } ret = dshow_cycle_devices(avctx, devenum, VideoDevice, VideoSourceDevice, NULL, NULL, &device_list); - if (ret < S_OK) + if (ret < S_OK && ret != AVERROR(EIO)) goto error; ret = dshow_cycle_devices(avctx, devenum, AudioDevice, AudioSourceDevice, NULL, NULL, &device_list);