From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id AAE1840261 for ; Mon, 20 Dec 2021 00:59:47 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D392268AE87; Mon, 20 Dec 2021 02:59:45 +0200 (EET) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067025.outbound.protection.outlook.com [40.92.67.25]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E6B986805B6 for ; Mon, 20 Dec 2021 02:59:39 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oTtpA1q2T4uUaTuZGMm2rsV66mD3T8/5A4WmgtTwZpKxGbd65aig9CH5jX/qTIauL9zPyNf4L9SEjttNAxfyXrfDJfLtqaueWvYvU2iWS4UYYOpxfeBR8yvob60fCtXbEhk2/0shJfQOxaw2+ZxzQdqn/GpLamZiNZAZXFrt2sI7sGfVD+MaNZ9/t2AA74HxUMK8AYT5x4Y4XGiK0PEgFvL0GxjGiQTxWkJIqsH5Xv2zn0gKAE7UMdRdlUtO7Fulaf917t7kmjlaq7hq7OrgOXd8ykVrbbtW97YqxwwUOskwNdWEeS/2SxujPN0R2zdgveAbS+LsRyqk1wwUHZ8nnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=HlNyz80zoreiG0C4OZyZBvRrm+XXko/4gwj5WpRf4ms=; b=l3+DeP00b2Y9x5jAqcXAjsqIAczZlXXipkgcEdAwlzcgH66WCqz87/JuI9zjJc+Sw8nLcYFo00axSborkLld2P4UPRgBfpW9AL6DeyfBnofamj7P4hNVwYjC/vwnuzwwZkIwEscGJzgiWTE9JywcfdT9t5cApa59Ot7CP9ayPVqyIy4TTsxYIJ2z8WJcGG1RiRKk0W8ON8dboVPlhNqnGujwlQFo6j0wDGdRPfavqBCuCaleDl0rApifVxSOcIrDGURaO865l2H4H5NxFDVDeq5C+vMZXQVf1sADzJIcxlsZtCujlcsIKbxGFm+b18fCgIZEVYcuPku/qzPqEpXRlA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HlNyz80zoreiG0C4OZyZBvRrm+XXko/4gwj5WpRf4ms=; b=ATHrulhrLfAGVLkAblcxoa1HVpI5RJYzhzjM/S/k1kxy+2Dyhznk5GdGtIxxZ6GzwC/4tdRJDVGjdq7x2sHxj16nrP8d7EUXQ59Cz6BILBEFqcUweEt511ENQlWaoSar6stlCYJSYw9YYHvM8U7OmSa1lgxZgVBpLjV5WEfkBdxmzNh0Utmw1duvmKcMoY6QgykFkee7k8I8R1b8YjfdQWzgSL+4jaEnes1VjB2cLSuZLsTlV6hHSAtxkuX+wMDgBIzRucvir9bUaSEeSbnh4VdF/rVcIOfWBjE9E5GeF6OzZnBaNsnJ2cwiLho8HfXWavU7ReOq2a1fxxNSsRT+SA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB6984.eurprd03.prod.outlook.com (2603:10a6:20b:29e::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4801.17; Mon, 20 Dec 2021 00:59:35 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%6]) with mapi id 15.20.4801.020; Mon, 20 Dec 2021 00:59:35 +0000 Message-ID: Date: Mon, 20 Dec 2021 01:59:34 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20211219192134.1296-1-dcnieho@gmail.com> <20211219192134.1296-10-dcnieho@gmail.com> From: Andreas Rheinhardt In-Reply-To: <20211219192134.1296-10-dcnieho@gmail.com> X-TMN: [AawQ3lzN9xDeDxKb2shnc8WwDLl/3fqR] X-ClientProxiedBy: AS9PR06CA0310.eurprd06.prod.outlook.com (2603:10a6:20b:45b::20) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <4280dcbf-9a7c-c8a8-1f23-85dce646eaea@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f1221540-81e7-4b5f-acf0-08d9c353fd57 X-MS-TrafficTypeDiagnostic: AS8PR03MB6984:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VP4jJW03FEblgL9vUl7+JEEIN0rGvhLDNS5NiYok3HXMzX5l0GjuKEYuQZH1QVpVjKJIWuSF84XWLh51erByOzIl72M80iuem6WJGeIXNAh8k7tiI9qRYJv5AGCe4aVinuwIe0kxF25zp6KSUnRKqXk6Wa75Q9qsBx3z2Ni9PX8621Lq2iBvs78bu22+VE/4m2hvgfP6vADKgW+9hkjl8Ql3VME28x2QhnWjeUmBEGNXSPl+v6jaC/56Z1t2RzHDaJAnqPyvsgS4Cy+dlapMEjfFOxWqDyqSYggtU/tH6C/hmhCrxrrfUxT+h/lYeUzJVflyCMG4wIjJf7UriLCPpMquqRtJBYqn6vKrzlwqjYO+TCmiOyP28VTdM4/2z8Ntc7qbUNL/oB/42CS0A3ojKPTjxxAa/iT/QRMQDZBtW7yhN2+Urvmh9z2UvD+iQpXkBE0pnhsx/wjFtiDdNb95V+NFzTgOcUj3GjdRTJLMTghu96wBhwGIGuv2DSOKuFPMP0FKEJ6nIyvUBtW/OTQQMrogWO7IkQ7b65zRsDvjZatnFJ75Btkcpe8ubMN2iUhTs0O027GDTAvzTGAdPWNrEA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?L1U1QzlaMm1QalBES01EVEZQbzFSbDRaZXI0Z25hZ0I4NUFRT29ROHpXeVRw?= =?utf-8?B?NTU3Z244YWFBUzJSbjR6L1g5eDlWL2tYeWpnYmNWOVZLdUg3ajltdU5rZnZN?= =?utf-8?B?NzdVbnAzaXZPQXdEWVBUTSs1MW5CbUY1U0hXeUhsb0VRZS9SSm5sWjR6TlJh?= =?utf-8?B?M1ZKOENGRyt2SDJnWlBxVlJjZm1DVkhvTXpxTmJKa2dhRWp5ejlUOG44d0lr?= =?utf-8?B?KzFtUSs0aW1rQUJReERBbVpCNUxSS20vMU5PRkRYNlNCWjdWNXZ6SWM2S0pF?= =?utf-8?B?dEZ0NmFQeUFsYWhxNlRxcjBKRXMzZ0QzSTZMbDBTNTl5NzZlMGRXYit3dmdL?= =?utf-8?B?bXpQczJFVjdVTVBMMStwU2tLTlJCRmVqc0ptRXdpUE9TckZPSVNuYzN4RXNr?= =?utf-8?B?bEtPbXJvY01nYXVLZFM0d0FGQzdNRnBPdEg1dUFrVVdRSFc5UUJwZk5MdjQ4?= =?utf-8?B?K1pZZVRabHkzK0trQjdOVGhRb3BTV0NpaVkwWk9mcURLRFJ2OFY4dmF5RUZv?= =?utf-8?B?T2FnSll3RFIvbTR0cG9CelF1K0dUWCtUdlQxSHRZajAyREFCWFd1N21XdlNm?= =?utf-8?B?VllpRmk5VzNvVnVPSHNldW9WcW9SOW0zNDdkMk0rN2tldHlQVWEyRlU4aUtR?= =?utf-8?B?V29kMjVGYjVvSjB6TG5IMDVhVnhGRWpjY1o0THE5OTI5UHFLSDBNUTViVVV0?= =?utf-8?B?bmJRbkR3blBFdjRSRDVDMndRRVlrdXZLMEVYUXZjMDExUEJQZTdkNWp2OWh1?= =?utf-8?B?UGNId2RXbU1UR1NjUUhpdWl6bFdXeTM5enN1RlVSNWpnaE5VT1BqenpkZUNL?= =?utf-8?B?eGFFZ2x0QkFIQS8zYVNQOVdEZG1mYjVPVU9CTjg4QVBIWVU4NHNja0ROT21E?= =?utf-8?B?T2Y1cEs4WndVRlZoSTdaZVFsRjkyTGRRVnhxbk9oUHhyd3FEbU1RYlo4VUlO?= =?utf-8?B?clBHdnpISFBpcWwzZlhvUXdEeGVHUGtHOWlSTnFLTEltYzFVR0FIbm4yNGRn?= =?utf-8?B?VFlabE9qczN1Q1ZKUDM1Mzg3cjE1WC9Rc2hRSGZ1amJPVGpwNE9pWjd1WFhx?= =?utf-8?B?dUxYaGR0ZmNpNURSWmtHUG43M0NvOTNncXFPMDhkY3JEYXloUWpmSFZtT256?= =?utf-8?B?R1NTcDVVNldSVjJUUXRrL0w4a1V6NTdQaE9DVWRWcGc3QmpoRkE2Zi85QUYz?= =?utf-8?B?R2dQSEhXbENZL3UxUS9UL3lXUzNjSUF4OThSaWc3NDlHei9ONTlOZWdJR2xV?= =?utf-8?B?N1VlanY1TUZ4cnp2SzlJSGpqUFlxVGRtVUVvTnRmNmhFTThYUT09?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f1221540-81e7-4b5f-acf0-08d9c353fd57 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Dec 2021 00:59:35.1594 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR03MB6984 Subject: Re: [FFmpeg-devel] [PATCH v5 09/13] avdevice: add info about media types(s) to AVDeviceInfo 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Diederick Niehorster: > An avdevice, regardless of whether its category says its an audio or > video device, may provide access to devices providing different media > types, or even single devices providing multiple media types. Also, some > devices may provide no media types. dshow is an example encompassing all > of these cases. Users should be provided with this information, so > AVDeviceInfo is extended to provide it. > > Bump avdevice version > > Signed-off-by: Diederick Niehorster > --- > libavdevice/avdevice.c | 2 ++ > libavdevice/avdevice.h | 2 ++ > libavdevice/version.h | 2 +- > 3 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c > index 2ae26ab8e3..712ef1e80c 100644 > --- a/libavdevice/avdevice.c > +++ b/libavdevice/avdevice.c > @@ -157,6 +157,8 @@ void avdevice_free_list_devices(AVDeviceInfoList **device_list) > if (dev) { > av_freep(&dev->device_name); > av_freep(&dev->device_description); > + if (dev->media_types) > + av_freep(&dev->media_types); av_freep() can handle the case of dev->media_types == NULL just fine, so the check can be removed (yes, this might be a tiny bit slower in case dev->media_types is NULL, but this is not hot code). > av_free(dev); > } > } > diff --git a/libavdevice/avdevice.h b/libavdevice/avdevice.h > index 8370bbc7f2..6f24976dcc 100644 > --- a/libavdevice/avdevice.h > +++ b/libavdevice/avdevice.h > @@ -457,6 +457,8 @@ void avdevice_capabilities_free(AVDeviceCapabilitiesQuery **caps, AVFormatContex > typedef struct AVDeviceInfo { > char *device_name; /**< device name, format depends on device */ > char *device_description; /**< human friendly name */ > + enum AVMediaType *media_types; /**< array indicating what media types(s), if any, a device can provide. If null, cannot provide any */ > + int nb_media_types; /**< length of media_types array, 0 if device cannot provide any media types */ Personally, I'd prefer it if this were unsigned given that negative values don't make sense. But this is just a personal preference. > } AVDeviceInfo; > > /** > diff --git a/libavdevice/version.h b/libavdevice/version.h > index 914e156ec7..c549768e12 100644 > --- a/libavdevice/version.h > +++ b/libavdevice/version.h > @@ -28,7 +28,7 @@ > #include "libavutil/version.h" > > #define LIBAVDEVICE_VERSION_MAJOR 59 > -#define LIBAVDEVICE_VERSION_MINOR 0 > +#define LIBAVDEVICE_VERSION_MINOR 1 > #define LIBAVDEVICE_VERSION_MICRO 101 MICRO should be reset if MINOR is bumped. > > #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \ > _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".