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 7C7F4494C5 for ; Mon, 12 Feb 2024 00:02:03 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3BD5C68D13A; Mon, 12 Feb 2024 02:02:00 +0200 (EET) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2069.outbound.protection.outlook.com [40.92.73.69]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8743468BF73 for ; Mon, 12 Feb 2024 02:01:54 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Hfhx1b5hOfyn2XduQpvsZBY9EVeUngk2v0wlUZiagmH5LkReKskCLASO54bXdAalRSuLYx00RMrJuKHuOG2WMZChS3TLtDlX4cX7dTZFxurYR/I7eUOMoT9FvZa5G7Y9WVOfmyqrRXQbcYD1r/XMeCdCHc5ilvwFO1s78vlOlb+2YacgZF08kLtTE8qMrbf+IlSqViq6IhAEnEa7aChaWbmTW5EdUYSN1IURVrskvctah/i8wC2QXfTWvofMb3mJbnpIz1YzltxHeP/8hk9w2qQQPx0QfL3cGEOVgHixdgDGUmsXN7fIu/CRg6L+PSHaN1kftiJtuFBPAgXNzNI8bA== 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=mVwrkkNF53odas0860lgcv0OtrX9YxsNW2Xmiqzpqy0=; b=hqma/MWND8rtGbUWnjRfLPwkwYmG6HBKW/awv0rb9MgUWPqqEfXZ0/SZGeNrgkf/ZH377bQc0tP7+XmPijWfLFAhF+n/z3STtsuF0vEMq0xEB6wgG6Bq7cXFjUCyoctTfy5iQyk/dA/dNeuFmA1xtJKWSGU2tXShjEx1dHPnBaZ888/0YeWVUL3biU6UN87CGt9GsEg4TqUD5fiz1lmsUuHvIyJRvkewK7k6MzUH3mdLqn9TBdyKV5skiHD8hjLGGol80eSEx4ZoJq1vFqgTGpSZ9ecCou+GmZ5hml0kjMc3MmAlCOPuedgGcKXgRAAouApQWdRaRyIVHgkTZ2tFRg== 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=mVwrkkNF53odas0860lgcv0OtrX9YxsNW2Xmiqzpqy0=; b=lbWO0S2y4M795X9yAhWZdUvIxIVzmsJC1d3Kr14tt88slDis07kcr1+wxfZ7SE9dzPCdR7JHolfryZsUptJvN7ZB/r9ux7JKqoaGs5QoVS3HMrniuY+5DmCBW/giiLjA5fQv0HVuuDQGjwm1+7uF4x2MxXEaXnuMW3uS3rM/2d7Ien8sdT3tE7btjFDRscAcjz1ftXJAp4f5V4akqOk06PcMswfOgViIO89Fq9PiJuwHvibXJa9tesRCKfJk0uZ+t46SLB9qsPpNL1uDXsTS3A6FuatQfYi3ScABcmgLD34cf8beBy44jp/aiQGAkNIFdKSek8fxaEx7ZUVsKLma1w== Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) by PR3P250MB0257.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.35; Mon, 12 Feb 2024 00:01:53 +0000 Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::db07:87f6:7c75:38cc]) by DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::db07:87f6:7c75:38cc%3]) with mapi id 15.20.7270.036; Mon, 12 Feb 2024 00:01:53 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Feb 2024 01:03:15 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [ZXzDzKk3MyQiGngNK1VEvUGxLwBf/NYiqj64h/gRjb8=] X-ClientProxiedBy: FR3P281CA0146.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:95::18) To DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) X-Microsoft-Original-Message-ID: <20240212000335.27984-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0P250MB0747:EE_|PR3P250MB0257:EE_ X-MS-Office365-Filtering-Correlation-Id: 6c20aae9-e894-4da1-33a6-08dc2b5dd187 X-MS-Exchange-SLBlob-MailProps: 9IecXKUgicARn8Y3S+OnDYbPol7RUrVJUkNXSXxSI6G+UyOGYzEIt4AUATBoSBaOaCIIfritQXqgxq4VaNRNyXmKucUVMmMzygHdXt6GCj05OO1ag2YAtbj48bmqrAsgH/ddIH7zjyyVSJKy/pXJHlDMQJ8nD/91drd2qom9we+36Ta800oMNncS/0gJQVmFWN5+dNrT/++w1XbxiOrb+Lq/1fdqTlDMx2oLZ5KBS/zRYGl8F6TPRbM/Qrz0t+d0P/EG82S/5OL0ykTfcyGt7DkzF/sPEv1R0I5Cdl6b2EIUd3uA0xtSJrPHh79dNIi2fVF08xPrgQYXy6uPjL3BulM0M7Rssg6Pi+dUxU2P3IURNIBYvJ6XR7+9NATfl+xPtzebnt10KgF/vgD4R+pxYP6G9wzF2q+dka+GvI13W66aYXnP3YdltAKQ/WKa5ii5eDrXXjAdWBKi9kfm5UqDdY6PW7/Z/VN0lCtsZq+yr+I4wU1FJ4mQvOGZMvaWH8eNNhQ9KMuCSwzZdPEXRLEeHK7fYoCPutw3J9LuP6z49FHdBb2HxVfocTKafCr0NAjXxm5m+DwqC/OP3HGAv6vqouAEQK2j9dt+//D1TfFatdhuZAlaft3kDSqGE+osWUDe4+1DzA7PO8o1MG0U7L8rpNQQkKYMw5nDmc1s1YEeihzL4/dC5KoHEZAlZjoB7w/znCKUqkV72YXPVulgExUPH4P3K+3+4aI3CApEVF+BTAEYXQqKJYezhg== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9YsjGHYrxJh9kQvIXO3NvbaZKQhd3dswxovdfVEFrfmmXOLpL7SDNJn0tmlVlEOzVglvly3VgcgcQJuTW1CI3FH+KD7IQ5jNWfo9+yW6HDBU+evsbDA+gZdlcTqbVRQGce32JJeR7s7cPiKCKAQznM/cp5sWuVpyHaevxRPbXmA4yPg+kKzU7Y5tqLyB/GCa+v74IIysgSGprTbjNqjh4M3ASR1ZiansYzBChTqw/eLHqi/kCRFpjHZfm3qtM25M0JHPmUGA7EDvJh+Hw74MGs89taNIrPkgkzhmwN+Et+mJtHnH2TUla8W4EAOQKE06J+FDEnXy9+XQ7W0AOcRVgQp6qdxgtz4XdcOOUYzmUzvBscx0kW7ZdlPlLr7mXJK793PGBajZ/ad1s18WGsywg+q2pI9+3+XnZiNKFB1YZXl3GH0++VnmzEflK1ZIS3exoIHqqihErXjiBJ2EhzvrFisxSw7Y8XGtIkoMH1n9wv1V/YzdLcLHES58e2HuvYqDwGMO5OaSB/gCakPWpArpdmr8jo1gDm9SauKNbTWfnHY3T5r4vHcXMGgJ5g2aPgyo6VxQAfVZ5DAEIMZmibNdbzBCgY8sFTz8QDAP8LM0bvTL2+GTYqC83SWQOkMzjNUm X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?dM+v7X3XMMJgtubesw+poDjaYRRef1d5xLscRjHGI/PtF0YfkDpoPcWyrhZz?= =?us-ascii?Q?QNJXxJpAK4n4bSi6e49N34mZWOPG9+wtZtFcAgHIh9BwBxqZdCW2+0RKPXe7?= =?us-ascii?Q?IJnxaDlA8lgWMtjEd0ZXWDqORLkH5WBVdqDomzT9T2JgCB0ggsu484336DAe?= =?us-ascii?Q?LvlzfqINfAQFx6Jhbm/pHmlMKVNWptbjZ57xbXsSrszbCPhRE3Zoh5ftb1Uy?= =?us-ascii?Q?bbPgPUZS5nnPmst2VhpQoEgi73emaHCFPp8j2oKt0rdPTG8ZUJTIcM76IRO5?= =?us-ascii?Q?0bzHifxxF7JisgTF2+qz2ldPNke5whUzHtIxW5cA70rPq7mDorMKIj5wFHju?= =?us-ascii?Q?zgudFcGmbh2TR52hGkDqb0lUWA5S/kljvgqgRFr+dXvB+ELrxKQnVI78EHNm?= =?us-ascii?Q?8pByggIAlYV0d6tz724TUqy3wI8k6ZQsy8HKqqfR3y40uywJP57DsGaU59vH?= =?us-ascii?Q?2aY8bqBJNoxom0FBpM4Dyw+CiXl5fj+Oyk+0/r30DbULwilGD0AMvSsLSPwg?= =?us-ascii?Q?npIuRstgVuEmdbeawdsnR1spCWrQANAxM1fLYw7NAZSrFWczkPZHL+pcCgi6?= =?us-ascii?Q?41GJ16JnN1uiKETWK9esZ6ZnKJ7zA+VION4CezYUaNcBi1VPDkaUS59ZHFjd?= =?us-ascii?Q?QIA7m/x5/AKOzW10Jn49pFHQyH66qyB7Wi8fYWAeV/UU2N0C0AH59I6Q5X8q?= =?us-ascii?Q?YtgpT8ThEg/lR+X3jqbVsfQjDjAlYLHx5z6TOsjhWea89LtVlRG12AIUSXzi?= =?us-ascii?Q?pglLRrucrU7fXjLUBXqfpONLywo/7lJqvLiz9CNI0PMUgrhHurzKd5/1oxVf?= =?us-ascii?Q?4nTcrPupVdO2gM3oEqXU7XP31Xwo31QmRTYIZI4DQhMRRV4Bbt/DyzTo5Dkh?= =?us-ascii?Q?XefCvQsx20G6dxCkTHrlGOcyfbAyrdj7xBu346avZSinSIh7OPj5jDHyS6LK?= =?us-ascii?Q?fZ+XtBq0ObaJmvr9pe4M7pTtfe38Fb9s4AlK2cqP2BRquGTK16dN1ENkazxj?= =?us-ascii?Q?78bQuGihESxHSFncpqUxOAp10vo7j9H/4WLckdNGS673mG4YCL1laD3f57Tk?= =?us-ascii?Q?i2+Oxa+QaDqZudPgAzHleekF+5t0BBw70d6hgX1UOhGDjqmNj1WuMRbyNofQ?= =?us-ascii?Q?575T4cJvw55q/oTNOR0nEiUdOW8zhZcWIgd393z2yfcUV0b0nTJEvjRiqOCp?= =?us-ascii?Q?5MqWVgK4ahFLZgTjB49OBEouIONzEg+wHzxF6roKj7cJkU1Hm2Gl/GACsWMa?= =?us-ascii?Q?m7SWpCQFfDhq4fDpJLnvG38lgKfiyOjwv0M4yQaqOQ=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6c20aae9-e894-4da1-33a6-08dc2b5dd187 X-MS-Exchange-CrossTenant-AuthSource: DU0P250MB0747.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2024 00:01:53.0031 (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: PR3P250MB0257 Subject: [FFmpeg-devel] [PATCH 03/23] avutil/hwcontext_vaapi: Allocate public and priv device hwctx together 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: Andreas Rheinhardt 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: This is possible because the lifetime of both coincide. Besides reducing the number of allocations this also simplifies access to VAAPIDeviceContext as one no longer has to go through AVHWDeviceInternal. Signed-off-by: Andreas Rheinhardt --- libavutil/hwcontext_vaapi.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index 29fc8bd648..7019769f24 100644 --- a/libavutil/hwcontext_vaapi.c +++ b/libavutil/hwcontext_vaapi.c @@ -75,6 +75,11 @@ typedef struct VAAPISurfaceFormat { } VAAPISurfaceFormat; typedef struct VAAPIDeviceContext { + /** + * The public AVVAAPIDeviceContext. See hwcontext_vaapi.h for it. + */ + AVVAAPIDeviceContext p; + // Surface formats which can be used with this device. VAAPISurfaceFormat *formats; int nb_formats; @@ -207,7 +212,7 @@ static int vaapi_get_image_format(AVHWDeviceContext *hwdev, enum AVPixelFormat pix_fmt, VAImageFormat **image_format) { - VAAPIDeviceContext *ctx = hwdev->internal->priv; + VAAPIDeviceContext *ctx = hwdev->hwctx; int i; for (i = 0; i < ctx->nb_formats; i++) { @@ -224,9 +229,9 @@ static int vaapi_frames_get_constraints(AVHWDeviceContext *hwdev, const void *hwconfig, AVHWFramesConstraints *constraints) { - AVVAAPIDeviceContext *hwctx = hwdev->hwctx; + VAAPIDeviceContext *ctx = hwdev->hwctx; + AVVAAPIDeviceContext *hwctx = &ctx->p; const AVVAAPIHWConfig *config = hwconfig; - VAAPIDeviceContext *ctx = hwdev->internal->priv; VASurfaceAttrib *attr_list = NULL; VAStatus vas; enum AVPixelFormat pix_fmt; @@ -384,8 +389,8 @@ static const struct { static int vaapi_device_init(AVHWDeviceContext *hwdev) { - VAAPIDeviceContext *ctx = hwdev->internal->priv; - AVVAAPIDeviceContext *hwctx = hwdev->hwctx; + VAAPIDeviceContext *ctx = hwdev->hwctx; + AVVAAPIDeviceContext *hwctx = &ctx->p; VAImageFormat *image_list = NULL; VAStatus vas; const char *vendor_string; @@ -474,7 +479,7 @@ fail: static void vaapi_device_uninit(AVHWDeviceContext *hwdev) { - VAAPIDeviceContext *ctx = hwdev->internal->priv; + VAAPIDeviceContext *ctx = hwdev->hwctx; av_freep(&ctx->formats); } @@ -718,7 +723,7 @@ static int vaapi_transfer_get_formats(AVHWFramesContext *hwfc, enum AVHWFrameTransferDirection dir, enum AVPixelFormat **formats) { - VAAPIDeviceContext *ctx = hwfc->device_ctx->internal->priv; + VAAPIDeviceContext *ctx = hwfc->device_ctx->hwctx; enum AVPixelFormat *pix_fmts; int i, k, sw_format_available; @@ -2007,8 +2012,7 @@ const HWContextType ff_hwcontext_type_vaapi = { .type = AV_HWDEVICE_TYPE_VAAPI, .name = "VAAPI", - .device_hwctx_size = sizeof(AVVAAPIDeviceContext), - .device_priv_size = sizeof(VAAPIDeviceContext), + .device_hwctx_size = sizeof(VAAPIDeviceContext), .device_hwconfig_size = sizeof(AVVAAPIHWConfig), .frames_hwctx_size = sizeof(AVVAAPIFramesContext), .frames_priv_size = sizeof(VAAPIFramesContext), -- 2.34.1 _______________________________________________ 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".