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 F1DFE49C64 for ; Tue, 5 Mar 2024 16:34:52 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 206AF68D091; Tue, 5 Mar 2024 18:34:51 +0200 (EET) Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02olkn2060.outbound.protection.outlook.com [40.92.50.60]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D574268CE3D for ; Tue, 5 Mar 2024 18:34:44 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WsD6xRXGgK/fv4znJ42eeYSPt3Oc0QKTJWxWvM2kb2UoeLDFfbgd2n/8OOkiETctjtxWk5a13bbb3Kdjj6mPWfKjIf3cD3jLNCDug4oT4/i+qsg27dzpkauVwMBtUbqgjpg+tY+IRZe8w+W1dYzQrLJgUiK9mrhREMQ3gYJZ9jI1BoZR4PkywmI3V60BLteh35Jjt4mVrqnUK9NTM6EeXqH5IsczNDSSbNNedyxsfn41PRK1dFdlo0Hg60XfgAVDrltuIqZixHiCk8Lz158SBSoDiC+RG6bVc8k20EWOs/4W33CuMUpDUOxljoW1oPRfBM7E/BF2LIRDCfNUZC9fJQ== 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=3jslt4NYgtvqxy/YavcwlW9VfGKrXbcbYnmhgjX/L4o=; b=UsqgJUriuiO4Tk0DsM/p6ionFlLmWh52hw9FrVorx76JvgZNzKZr5sRamlwqaV2bfG4rWMt1UE5+ZERtVIa9hQ5nhkbhSGhKtHDr58gvv66SC992sp4KTMt/QNp1ecKiRi1ZuhMrxq7efPnVexsi9Rxxm7XPBOnQewlWVv5pQaVg2iTD9ZWS+VGxCXH4ol8iEJxmyWpYLuqB3YEiEto/LM6m1q9Qc5/RxWVby7bMSBdXc1+I8Wae/dDp47bOpWnBhbYGmWu7r/vJeUlaBUO4CqtHtKzMznr6bQ+fE27nCK+G/Sx+zD3EKVbL/B7shBO5jG+J0RvkCExMYiRjxAi0kQ== 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=3jslt4NYgtvqxy/YavcwlW9VfGKrXbcbYnmhgjX/L4o=; b=Jl3fcZWHdCV6BYtYLrwBOLforPWJc3zOSgz/KCR9KhE6ijxdrUOhiXWFBV2oGiHiPVf1exDfgij/citgVS1nH5IZfGUGT4cBntHX8mZFjmwbqJQGRnralOoaTNOctPXnOMqT/318cOT/cIoLTemC4+Qz0AJEMjd7i7k0FVoLbmclrF7HxkWIBLZF5lgGP6RDPR4BVlcnBWcgaUdALErJJQ5BurxM685d+58GR3H3BIrRCA4ZfXUjjYNUdsh6lue41y9U/i/3sHVwB9mrP/Lkedutxp0iugncPx30GGE83lFqnHu0DQ4oNyk1F6UrFprmIgqhyLb9JuUa7jG7Ht9BCw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0396.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37f::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.38; Tue, 5 Mar 2024 16:34:42 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7316.023; Tue, 5 Mar 2024 16:34:42 +0000 Message-ID: Date: Tue, 5 Mar 2024 17:34:41 +0100 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: X-TMN: [b2PR+ozCzuGS4lg68HJ22XHpKfUPxOwt4RPugcmwYGQ=] X-ClientProxiedBy: FR0P281CA0011.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:15::16) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0396:EE_ X-MS-Office365-Filtering-Correlation-Id: 6af4d2ba-8d64-4d8d-eb88-08dc3d3228eb X-MS-Exchange-SLBlob-MailProps: obhAqMD0nT/u7zouxSzPCfDpBJ1Y2is9aEYhaFiec7XqGHiD5b68cWZyn7WmQ3sftbi7d0PVZ7J5D6tL2vKVuCFvJ19+2J5J23qWeNa0B3UGJYXbC3r03oXePxjiUVz1FA99s22EY3f409HZy+vurLF1ygZtehgjW28fEv8N8vIz602qGBH065EH1H3RQrnfpFdfYi/8YNrb3mN1ZSLzP483EarlOQRbq7xXiA0NQfWb1NqEgcPNGKHt/cXoWJNZF5vWLnaHsx/UZwpnxUSVxrSfrQCT6h1/u+A4nbdQV1+8rXZ4Bxlo+zO5z1nPxu2QmTjL5mcCiF+62vjzwSUnjvIf8JkieNkG81tSTKbn7JvkQDT/EMTEHpgpEx6p5RjjkglE7J9XMe9G9v9buR7LSwZ5swIHrOMivP3GO19TWWKOvgdZGbB5DktsBe54ZrNLUgOqH1wGvVC+yr3nPrvNFDfVGmhZZPYfh5JzqgSglLLysUZ0tPYcM8f5X9AR1FcV+rylK3ahZXCDaDvw+GfaeArCWE0fBZQMyZNHcP1NPSsqYihRWOMkB8VY0tTgTAwdmosy250PearfHWbzcfLfQxuJk1JB6/ljFeInoLo06VLIaVJ1mkVcG6K8k8EfXkJjOs75dlBwToDq/i1w8hUflHZ0wiX88XvWGt5NqZJ0T8OQXLRyjVWyhyvkc5uxB0vWojsGk8V8EYQIqqJnFizSw4v1o54QtGJ4OwgFMua/UNSbPlU37UO7W/Tzoh0A4GHOzvOTTxRULC021KJr+K6K1vjRSNr1tjIWcAwUXffeubROJhq/tMY8GtyS581Q/Jcz X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZJA5zEtIG+xTElUdDh/6zn3JzaZQVz6lNqmq9ofyaLHlMHRoQYXtj2WdDVSO8+AtEItRFlQunjIcPZBRhqGFlVWvrnWQbzZcogX8eBmI+Y48w0MyDbtEPxvNMYAS1HJ/wlpB8JtLNoxsbzPBiuPhBD47BmKZabrv6YFILiD9aEP6Iax0o+3t6/FrvpilkiUx3ZHAuHgQMPKHjUDm8mV/uy9/U4VQE1AB5k2ru4C1MVfX2fP+ya2xe6h7jt7pwRamKgwSOLtSitHUN83HbNi0JeQD2UKz6nkkdA9r+3rIQWXhP7+I8Vb8DeM9zvtv9Elmnu68uOS1Mb5owWBCWUZWPrCaQUsUHvcXDUcwY1LPZ0U2SfBO+MV5FOiP9zL15Ddflfq81q/kncirsFPkcrxe32g/oot0gAOsIRyd0F8J04p2ysbuIWVdIgvF5NdCwcQ8hr2ArPKnGjulDI5W2M19gmyYpvjgLl/hnb+E3+kznJ7KXkiMIMGzwboTCr7sHk6SHuiVofRu2T45Bx75RoxnVQJXO3CZ4hp8c53QeSNLfsFmAULP0ps1pLY8bQYHMdAQ+7TJPcYMsZ8i7cUN8eGgHENXhMae1bET1xayn/PkJZr7MbRAezZH8csUpqNG+2Edcp3ywKS5q4bsVdX63cojR+GHlQknTbSvj10sp5YgG14= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TUhpVWgyMnZJeWNRTktOQUNMcWZiaUZoRFlUL2V5ZDlSYVI3YTFPR1U3K00x?= =?utf-8?B?QUJuQmRXa1dmRnpjbnl3UnNNZ0Q5TnJVTzMrSkJ6VVRtMnA2WGxOWW1INWNF?= =?utf-8?B?eEV3V3FSTmliWFVUVUdhOGs1NitVazJLNkMrdXhoKzFFSVFuQVpMSVA1WjFi?= =?utf-8?B?bGFEUE5KMTZneDUvTFNHZ1hPeCtoNmZiUEE4NGpUVW9KR2RVVEtjZzV1V2U4?= =?utf-8?B?dUJxYTVGZDQ5NGFGcDVIcHlWSDVIR3l5T25ZTEVpeG81aXRTUU9DRVkzekpW?= =?utf-8?B?Mk5jaDRoRlZkbGNXWEp1Mi9ub2FxbTdsdzd3SUR6MkdSV2JINm52N1pLUHll?= =?utf-8?B?VXlacFdEZTJQYjhpWlRwM3l1QmpGTDFsZW9BVGZnT2kzckJJa2VldG9YVk5E?= =?utf-8?B?TUkxUjYzSEZiSHpCNU51ODhrZkgzR2p0VkdRS3Q4WW9MY0ZOVkNIZnltUUtK?= =?utf-8?B?Z2xOMUtYbXZySGlOcnR2anZwRGkybG83blNWZTFoSGdPcmFVc2N6Y2NkYS9J?= =?utf-8?B?SkdocnNQVUJkeWdCNjRkNjI2UkJWTWtKZC8wS291dTJpRjU1dkk3N014aG16?= =?utf-8?B?dTFKWUdWUndmYlVCb0J2Q2J2MlhkbDhzaDhGYzdBb2Y3bDRLeU1rVlhsc1ha?= =?utf-8?B?THp1cTBCaXBPSWtqOFBqdE1PY1pwU1hxS1BQbll3TzU4eXhVR1orU01yM054?= =?utf-8?B?VWREbVNXZmI2ZFlkdzlKMWhyM0I4YnRMdU1ITnpSZHF4RGk2c08rRExrNlZI?= =?utf-8?B?Q2pDcWVWbFVBVlM1Q2kzVk1SU25aT1MrUitMNGphWFRXLzQvZEVwQy93R2RF?= =?utf-8?B?K09zc3JNcnRKeTdZR3E5a0J6b2ZVcXRWZm0xZlQ0NG94UHJLYUNMdklWdUFW?= =?utf-8?B?V1Z1eEpObU82bTVCdnovTjBRWEYyZzE1TjlLRThrVnFpU1RURVZsbFc0RDJZ?= =?utf-8?B?RTg1a29qLy9TVWJTb3REWFQrQnVMTXlxNVFkRnBYMGhFZ3cya2s1T1B2M0xx?= =?utf-8?B?dW5hNDZMclUyRjhXOFlwaFhPLzZXZ1dKQmVhaTUrR0srUi9aMVMrU1IwKzhL?= =?utf-8?B?VVRwQ3JHcW5KTTZMbmpaVzhWeE9MV1FlT3F1VzFlUGNpWVRDTDhLM3BML1VP?= =?utf-8?B?TE5MY2o4SDBwT3NMQnd5OUo3RnVQeWZZUjBHK2hhK2NGdzNSYTd4aURJdzRD?= =?utf-8?B?aHJwSGFCM09SMS9DRklJVVRmcThwRHRWNnZvd29nb3lJcVltMDllSHB4TG9n?= =?utf-8?B?V1liWG5nem9LdVM5QWNaQUtIWHhVMUN4aHpvQ21KK3UrdDFjVmEzb3Y0YVpB?= =?utf-8?B?M0VGR1pmMytSMjcxOHA1TDJudmttQXRwSEdBQ2llSExycWNaVnIwcnkxK0ox?= =?utf-8?B?bis4VmxkaHVDalRZakxjWW5yMUl6T1RnMFZJbDJmOGo4RXZpMnV6U2JYNGZY?= =?utf-8?B?MVE3N3BwZTRJM0ZHYTI5K0RWWExoVnNMd1JUTktnSmYxWFh4cnZ0UytQNXJR?= =?utf-8?B?S0dwUThBaWdsVGNxVmw5cFJxZkZGSE5MV1kvb3ZWT0h3SUJMTTIwVVkydXdi?= =?utf-8?B?SG9qaVdabXpCd3pXNGp1a25wV09IU2xIbjRWeUFkTi9rQUs5ck1EaHIvRDBu?= =?utf-8?B?cVVwUWR2RXVDV2lXSDdobndESk9VYW04R3YrNWUvMThBbXdhKzI3Z3l5UEdk?= =?utf-8?B?QVh4S0lteCtXSXdmRFZxUlNiVEh4NVFQaGR6WWMrWFNoWVd3Tmt3b2V3PT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6af4d2ba-8d64-4d8d-eb88-08dc3d3228eb X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 16:34:42.5323 (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: AS8P250MB0396 Subject: Re: [FFmpeg-devel] [PATCH 2/2] avcodec/vdpau: Deprecate redundandt allocators and getter/setter 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: Andreas Rheinhardt: > The allocators have been superseded by av_vdpau_bind_context(). > The latter have only been added "to allow multiple forks to add > fields to the structure without breaking ABI" [1], but libav > is no more, so this is not needed any longer. > > [1]: https://ffmpeg.org/pipermail/ffmpeg-devel/2013-August/146954.html > > Signed-off-by: Andreas Rheinhardt > --- > doc/APIchanges | 6 ++++++ > libavcodec/vdpau.c | 6 ++++++ > libavcodec/vdpau.h | 24 +++++++++++++++++++----- > libavcodec/version_major.h | 1 + > 4 files changed, 32 insertions(+), 5 deletions(-) > > diff --git a/doc/APIchanges b/doc/APIchanges > index 523945e511..16098fce90 100644 > --- a/doc/APIchanges > +++ b/doc/APIchanges > @@ -2,6 +2,12 @@ The last version increases of all libraries were on 2023-02-09 > > API changes, most recent first: > > +2024-03-05 - xxxxxxxxxx - lavc 60.xx.100 - vdpau.h > + Deprecate av_vdpau_alloc_context(), av_alloc_vdpaucontext(), > + av_vdpau_hwaccel_get_render2() and av_vdpau_hwaccel_set_render2(). > + The former are superseded by av_vdpau_bind_context(), the latter > + are unneeded as the relevant field is public and can be accessed directly. > + > 2024-03-05 - xxxxxxxxxx - lavf 60.24.100 - avformat.h > Add avformat_stream_group_name(). > > diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c > index c56ee1f44c..538c57f9e8 100644 > --- a/libavcodec/vdpau.c > +++ b/libavcodec/vdpau.c > @@ -64,15 +64,19 @@ static int vdpau_error(VdpStatus status) > } > } > > +#if FF_API_VDPAU_ALLOC_GET_SET > AVVDPAUContext *av_alloc_vdpaucontext(void) > { > +FF_DISABLE_DEPRECATION_WARNINGS > return av_vdpau_alloc_context(); > +FF_ENABLE_DEPRECATION_WARNINGS > } > > #define MAKE_ACCESSORS(str, name, type, field) \ > type av_##name##_get_##field(const str *s) { return s->field; } \ > void av_##name##_set_##field(str *s, type v) { s->field = v; } > MAKE_ACCESSORS(AVVDPAUContext, vdpau_hwaccel, AVVDPAU_Render2, render2) > +#endif > > int av_vdpau_get_surface_parameters(AVCodecContext *avctx, > VdpChromaType *type, > @@ -400,10 +404,12 @@ int ff_vdpau_add_buffer(struct vdpau_picture_context *pic_ctx, > return 0; > } > > +#if FF_API_VDPAU_ALLOC_GET_SET > AVVDPAUContext *av_vdpau_alloc_context(void) > { > return av_mallocz(sizeof(VDPAUHWContext)); > } > +#endif > > int av_vdpau_bind_context(AVCodecContext *avctx, VdpDevice device, > VdpGetProcAddress *get_proc, unsigned flags) > diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h > index 35c4b1096b..8021c25761 100644 > --- a/libavcodec/vdpau.h > +++ b/libavcodec/vdpau.h > @@ -66,16 +66,14 @@ typedef int (*AVVDPAU_Render2)(struct AVCodecContext *, struct AVFrame *, > /** > * This structure is used to share data between the libavcodec library and > * the client video application. > - * The user shall allocate the structure via the av_alloc_vdpau_hwaccel > - * function and make it available as > - * AVCodecContext.hwaccel_context. Members can be set by the user once > + * This structure will be allocated and stored in AVCodecContext.hwaccel_context > + * by av_vdpau_bind_context(). Members can be set by the user once > * during initialization or through each AVCodecContext.get_buffer() > * function call. In any case, they must be valid prior to calling > * decoding functions. > * > * The size of this structure is not a part of the public ABI and must not > - * be used outside of libavcodec. Use av_vdpau_alloc_context() to allocate an > - * AVVDPAUContext. > + * be used outside of libavcodec. > */ > typedef struct AVVDPAUContext { > /** > @@ -95,15 +93,27 @@ typedef struct AVVDPAUContext { > AVVDPAU_Render2 render2; > } AVVDPAUContext; > > +#if FF_API_VDPAU_ALLOC_GET_SET > /** > * @brief allocation function for AVVDPAUContext > * > * Allows extending the struct without breaking API/ABI > + * @deprecated use av_vdpau_bind_context() instead > */ > +attribute_deprecated > AVVDPAUContext *av_alloc_vdpaucontext(void); > > +/** > + * @deprecated render2 is public and can be accessed directly > + */ > +attribute_deprecated > AVVDPAU_Render2 av_vdpau_hwaccel_get_render2(const AVVDPAUContext *); > +/** > + * @deprecated render2 is public and can be accessed directly > + */ > +attribute_deprecated > void av_vdpau_hwaccel_set_render2(AVVDPAUContext *, AVVDPAU_Render2); > +#endif > > /** > * Associate a VDPAU device with a codec context for hardware acceleration. > @@ -145,12 +155,16 @@ int av_vdpau_bind_context(AVCodecContext *avctx, VdpDevice device, > int av_vdpau_get_surface_parameters(AVCodecContext *avctx, VdpChromaType *type, > uint32_t *width, uint32_t *height); > > +#if FF_API_VDPAU_ALLOC_GET_SET > /** > * Allocate an AVVDPAUContext. > * > * @return Newly-allocated AVVDPAUContext or NULL on failure. > + * @deprecated use av_vdpau_bind_context() instead > */ > +attribute_deprecated > AVVDPAUContext *av_vdpau_alloc_context(void); > +#endif > > /** @} */ > > diff --git a/libavcodec/version_major.h b/libavcodec/version_major.h > index 161442df95..9e75303ed6 100644 > --- a/libavcodec/version_major.h > +++ b/libavcodec/version_major.h > @@ -54,6 +54,7 @@ > #define FF_API_FF_PROFILE_LEVEL (LIBAVCODEC_VERSION_MAJOR < 62) > #define FF_API_AVCODEC_CLOSE (LIBAVCODEC_VERSION_MAJOR < 62) > #define FF_API_BUFFER_MIN_SIZE (LIBAVCODEC_VERSION_MAJOR < 62) > +#define FF_API_VDPAU_ALLOC_GET_SET (LIBAVCODEC_VERSION_MAJOR < 62) > > // reminder to remove CrystalHD decoders on next major bump > #define FF_CODEC_CRYSTAL_HD (LIBAVCODEC_VERSION_MAJOR < 61) Fixed the typo in the commit title locally. - Andreas _______________________________________________ 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".