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 860FE494C5 for ; Mon, 12 Feb 2024 00:03:53 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1CED968D1CF; Mon, 12 Feb 2024 02:02:54 +0200 (EET) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2091.outbound.protection.outlook.com [40.92.73.91]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BB1F868D1CA for ; Mon, 12 Feb 2024 02:02:52 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FGxxnwh/PqLImp7Z+2GaT11kDJKR9GSpf2yfy4gCGCRCjXW1Q2GkEzOCqnb9MolCkh/bLxzHAsYanjn9TunXbF7yDLnEMZo61SuWoC81w71FtEiwHupHrQbsYXwcEb9ouON+UUuIaDJ3yL5aVICzoCTZIC4F/UB6KhIEBm5jVDMrWermQ5B2h+8s34BtgdBzXNdcfO3jyeK0tCWpUqzugUa4V1O8Nll621zT7Fq8X9/kCXXhWWIkhYJDnY4cPxeOEn/VPzIZvSvNJjLUUNcBlSPVoF7vTjvQvU0Jsl6XbYLQAkduOsd8rXu6pa3VoNVpT8uJoInsiV3KbqZEumQKrA== 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=ZHaR3VlnRQ36tLlUSG7a0Oz6AyrYmHSWUSY4lsIHKhw=; b=XlhGsfHoDsslVk6Q2VS8tSs75hOnVRPCaDGlCUB4cVae7yeFLPKU2DMaX1UnxdEpsRCTg4KqjjIcYaYBrMsqkFLb/izdEH/hq22FFPe5c7c2zwV1ycmj4y1BY5PnLpUm31AtA6EDC6IuN8ySZh0pxnYZF4AR6dAC7ybYNerkoZlq2HeXEGJRm8h5lSVdJxw8eUUbyRZyuPw4g0pPv5vJXJvN74GqNzzci+g421z9ELNWdHhmWsQFwE4WUVonwO+KpSOVkbqRufEH1R6tIfpje9XsJ+KWGthFHwXGSsZHimcQ7Jhqto4SVFFiUMCYNGtDFjLRfQHERyDhVN6rTdxtxg== 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=ZHaR3VlnRQ36tLlUSG7a0Oz6AyrYmHSWUSY4lsIHKhw=; b=SMbBMgByCnkFGiigkEb5Eg1ASBrgyjCVfxVxijESzf3WnvfeM4pcBxPQbZDXYCD2Nrtfm67OeF7dKH2Yu+q6Dw/4MwGBeA6kzut+2S5FDn29xKB3O/7sehkHkyWSWTBYPqr55dts343TCeJ6TCAWfGsILNuo4CJEwnL8MEh2t3/OwShUzKgiPQqzXNSzbpQcVQK9A0WiQIbE49Um+j31wt1xqC5HN9qWHgUu+ZRmOoFDz0PoneEKhPhK8xSVMoqJqiUUVji4CivkOkPc1NeR6liW+Nq5MgrDIndxvD94ZC6+KsPIc9rKcHORmaWvP6i1b70eJHIlN+o0/rgBTJ0xRQ== 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:02:51 +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:02:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Feb 2024 01:03:28 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [TB7LZpeojB5rMvL7EHPOiHu5N5zncvUGlq2uWJNGA5E=] 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-15-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: ee6194b1-1cad-43fc-7c44-08dc2b5df42e X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnqwZHg0HfSFdl5Zlrnc8YAZMqDtUbVXlqasn6cfMx/BBt5oep8ZNiPVMHpY1yNbAfkVH9PMLikUi2QoeRpSSJKcuWRm8eJ+YL9+vIVKxZ3wf5u2Lzj2ogqMLRXOvtTCB5tM17YsqKs7reYGcMU/xJQTjoGGRu2GsGMEvGOQDkzuppulFp2S6QiDfyxbfa0ZU0VksHKKju3buBTA3gXxgagCm7U2KlgNRukl3Bq3UEMXJM8QRM9gTnJr6Ph52R1dF1UCo/NgCry1HTwY5PslpzaXuh27F402vcKE+VuMMPH36fVKybFzdm59Dp10RnR+TeSP7sIQ4fxe2Z8EZjLYzLi60IisEDQSlpNM188XhcWj9bbYbDsfMfBsNTjQVCXipSfdcs71oXQwIA0D5GHFe7xTSvRWsvK1Aos8EhVLy2RZnORcy5oifsJndXCLZzahZF8CHD8K+GilWxxAMgLhA/L3WJzkaIWLqDDyNXf6hDprJkHZQe1NrVcdKsQ1XR/c1eqoNVktO3erECbUa6ASYHMFOjoixmYGeF4+EsgdJfaab3pWgGG7BywtfRmGCQVnj6LEKGL2U28WwCJgqsoZGQLsHTO5Rb0DC+I0ZfYJ5ocvzJc2H3cw/CvNawn6PGTHFpeU0tZKj7btaXTUTMotjJMCgToi6Pfz0c0JxiD7HQ/SE/xE9whxjYQd5w5qzd2JsNr295XPYsEPY/5qYLQRDOBS2AFhovywiFOVuUi/eyTgaJDyPWpP6P+trLrVsyqZhNs= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nQ3bi70VHI/729vWuBx7P7emlaEA4OSyI6jt1DArxBVyopNrmMDr4Bz0+7UefdVW2iO0MrV2Xju7l/D55MYwEpS2+T5ltLXmp1pq2NOOf7nuhMSoIc837qkTD8IYMhK3UojqaS2WnxIQ10oLBZszmxHoP1UWdfaV+9nUMWJnVpmAQM9T+w3iGZUuq6S3z1LTlvAX9ywT+XBLRmJzGlie5PRrbllI2OqsGbHPxK9hVq+pZ6erzIaJdw8yJP70ctwS4o6nP8o+ZBW6xA2g8+0d4z6nXR9/AqWYiyj1LI18jH+pggHeqAECn5mznVPXDXo1WGMMJ7foU1bbYqqkDtT7t7lCgoXkB10FBVPW0vpuf70bgz75hydcLSFZWra6byr5JtSonMy9X1Awyt/QfPWqmymgRMMhUj8bpKgehsGZVfX7QV0GGq5jlD81RklsuxVYj58ozYS+pcsFvfisVcbz/fAwdBnIYJKXNkU29G3PRcLmQlWL0AnIGVcNwlrA0Kilcn991t9BtnJ/zWLBn3XZoHJ2UfN4O6x7eWstxYf9UuR9cKYe4zG9FA6kHJiyx+kVO7BZOzY7nZTvuB2k7bgHhvlUHcv7EsLOjAbQDNeex/3DHrR+niMxmj2QTC/r4blW X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?RisKlIxYtfKbnPclf4v25MH90B7RyPThiQ8pNubDyqOwze36R7OpIqS8JbQS?= =?us-ascii?Q?OjUd5YSK950QL3UXrfiQaiEGXeLqqADrfeF5DOhgMzZWf02gHt+lx3PADdm2?= =?us-ascii?Q?rroKVz/yDGSMrg3PCl/aL4tkQvKVXZ/YwpwyYVAwU7TNHNYNgeuF+KyrkFGu?= =?us-ascii?Q?uPxPiufp1q+HnPw72PYlkc9iPZyvUI+jEW1AtrEam8kQWf90nQIMNyMJyekR?= =?us-ascii?Q?KpF3sNkf63LukkZusLeK2Fu4NB0r2is8NoXBeJKeirLJ6oyJz/Fj3q98I1mp?= =?us-ascii?Q?21biceFXiM3cH1yE8n1rzWoPXt00vFxx0WIR9Qzc9VImXiAxDFKUzLRaTjC5?= =?us-ascii?Q?syF3wufooN/X7xqMCruolUvNkTVXrXAum6gYfeIHWXLsLv4mwjJHeSbN3z6L?= =?us-ascii?Q?BHcINwl7jF952ICLrwJLnnwBGg28g5tiCjh5jpA1q3INF+LECjtpYewsIwoF?= =?us-ascii?Q?+J4bBvJ9F0UJUldU4Xq92vfBpCmRV+2yVc0ANZD+le7iQfF/yGM3Bl9qbiIi?= =?us-ascii?Q?kjLCtoxZwThb4BawUuk48WTlrFEDwnUjYqj60yAlpTAiMtbPAS1dXhYo7i54?= =?us-ascii?Q?oWsbd/j/iS+5yC2YLf7v7qvQkyy1dvVBk5wcJEGEgqE44DR9Fwhr9655tVRc?= =?us-ascii?Q?HAQNYs8JHmDlGzW30Q1Ph+1H9mR9NSCpQ6WL5APozkaPospbq48Dt2yvH/WV?= =?us-ascii?Q?vQ2EH7Bf8s9GEFAOG3/+SqrtBENJFD4c52HR2k6kH9m05rKPYrJf2clZPCVT?= =?us-ascii?Q?ik9zc3awFqTZQx92W3waJSFcXN09plJM/JDOpUoewe4hOe7HNBXHc2oIUsNx?= =?us-ascii?Q?H6oM05v/a7/jp/A7py54algZOpWcByUwbjQiEK5SXiUm8A/wf4m58KGRKXDr?= =?us-ascii?Q?N/dckXSj8iwdbbCV3La3DKJvc7TukZBnJI1wFKjfXtEdokl/B03wMSRCZuB8?= =?us-ascii?Q?+4fJzVUy3FY2FjkDeMgO1D+d7kmb7qVtFMSPbEWrLnd8fzfIa3IWq8E8IXnG?= =?us-ascii?Q?8WboZb3/Ywd7kMK9S/Dai19wpXpkRjOetHLA/LL+ZxlMORHFG91v0uBfShG4?= =?us-ascii?Q?AolY7UKCLSafniZ/ia+hH200UlR51MD67rMCig5pxWeuMevyUqdHZajYx9KJ?= =?us-ascii?Q?EvmLyU67JsH+9+c0QhEhEPSZJTXw+/Zzz4DHdbJ3tKKkGm9EwCSEYcc9BYVq?= =?us-ascii?Q?q+4E0XvxJTLGG+AuH/gNUt4UQVb6wxJv5vkYXG8Q0RXkqj1RZv7iU3R+3mbh?= =?us-ascii?Q?VkhH+/qTmJGH7jK581vdZ8hRESldOVDNYrH9s8ku8Q=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ee6194b1-1cad-43fc-7c44-08dc2b5df42e 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:02:51.1050 (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 16/23] avutil/hwcontext_dxva2: Allocate pub and priv frames 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 DXVA2FramesContext as one no longer has to go through AVHWFramesInternal. Signed-off-by: Andreas Rheinhardt --- libavutil/hwcontext_dxva2.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/libavutil/hwcontext_dxva2.c b/libavutil/hwcontext_dxva2.c index 2c11f151ff..0922776342 100644 --- a/libavutil/hwcontext_dxva2.c +++ b/libavutil/hwcontext_dxva2.c @@ -57,6 +57,11 @@ typedef struct DXVA2Mapping { } DXVA2Mapping; typedef struct DXVA2FramesContext { + /** + * The public AVDXVA2FramesContext. See hwcontext_dxva2.h for it. + */ + AVDXVA2FramesContext p; + IDirect3DSurface9 **surfaces_internal; int nb_surfaces_used; @@ -99,8 +104,8 @@ DEFINE_GUID(video_processor_service, 0xfc51a552, 0xd5e7, 0x11d9, 0xaf, 0x55, 0x0 static void dxva2_frames_uninit(AVHWFramesContext *ctx) { AVDXVA2DeviceContext *device_hwctx = ctx->device_ctx->hwctx; - AVDXVA2FramesContext *frames_hwctx = ctx->hwctx; - DXVA2FramesContext *s = ctx->internal->priv; + DXVA2FramesContext *s = ctx->hwctx; + AVDXVA2FramesContext *frames_hwctx = &s->p; int i; if (frames_hwctx->decoder_to_release) @@ -135,8 +140,8 @@ static void dxva2_pool_release_dummy(void *opaque, uint8_t *data) static AVBufferRef *dxva2_pool_alloc(void *opaque, size_t size) { AVHWFramesContext *ctx = (AVHWFramesContext*)opaque; - DXVA2FramesContext *s = ctx->internal->priv; - AVDXVA2FramesContext *hwctx = ctx->hwctx; + DXVA2FramesContext *s = ctx->hwctx; + AVDXVA2FramesContext *hwctx = &s->p; if (s->nb_surfaces_used < hwctx->nb_surfaces) { s->nb_surfaces_used++; @@ -149,9 +154,9 @@ static AVBufferRef *dxva2_pool_alloc(void *opaque, size_t size) static int dxva2_init_pool(AVHWFramesContext *ctx) { - AVDXVA2FramesContext *frames_hwctx = ctx->hwctx; AVDXVA2DeviceContext *device_hwctx = ctx->device_ctx->hwctx; - DXVA2FramesContext *s = ctx->internal->priv; + DXVA2FramesContext *s = ctx->hwctx; + AVDXVA2FramesContext *frames_hwctx = &s->p; int decode = (frames_hwctx->surface_type == DXVA2_VideoDecoderRenderTarget); int i; @@ -216,8 +221,8 @@ static int dxva2_init_pool(AVHWFramesContext *ctx) static int dxva2_frames_init(AVHWFramesContext *ctx) { - AVDXVA2FramesContext *hwctx = ctx->hwctx; - DXVA2FramesContext *s = ctx->internal->priv; + DXVA2FramesContext *s = ctx->hwctx; + AVDXVA2FramesContext *hwctx = &s->p; int ret; if (hwctx->surface_type != DXVA2_VideoDecoderRenderTarget && @@ -586,8 +591,7 @@ const HWContextType ff_hwcontext_type_dxva2 = { .name = "DXVA2", .device_hwctx_size = sizeof(AVDXVA2DeviceContext), - .frames_hwctx_size = sizeof(AVDXVA2FramesContext), - .frames_priv_size = sizeof(DXVA2FramesContext), + .frames_hwctx_size = sizeof(DXVA2FramesContext), .device_create = dxva2_device_create, .frames_init = dxva2_frames_init, -- 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".