From patchwork Mon Feb 12 00:03:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46207 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9002:b0:19e:cdac:8cce with SMTP id d2csp402706pzc; Sun, 11 Feb 2024 16:03:56 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCV1gOtyGwtSidCJZ9i+1kdMj7u5JgvHmUJrBLo3BqZkBGqxAiJ5m5ylPc6ieMVi2rEFs+cTs2IuiCWCOrHMFVJI+Q78DMUFzBmCbQ== X-Google-Smtp-Source: AGHT+IHg6U7+9i71N32xiah1HT9BLDY87pbJ8bWpyLYvIeRDPiD3toweu1bm7NkABLgK4h6NScPi X-Received: by 2002:a05:6402:120a:b0:561:55d1:3709 with SMTP id c10-20020a056402120a00b0056155d13709mr3327064edw.40.1707696236210; Sun, 11 Feb 2024 16:03:56 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWXGUw+D14YL8tmon7yj+VuAzV6zfTXybfP+u50ABrTw+FPlMec3qxFexXg33E74WnkAUbTf0XfLXVystzDuOQZdVkH0laQnQ87TQze5LD4XdBaXmXh3tGRE6rs27vT6rXgkb+4ZA3zyn5IuG9iA8n+YEjOL+nUW1Bc2MmxW1HfG7aJsRhvsYrUQX5344cnBH5JblsVHCPBjva0frqlDu5zS1U5N3QlJjeLHcMd4bqNGbMaUFFqimKvUzhasKxD/KO3JpbImFT6ViMcrKfR77fUhCVF6CfBFHQjWRA6qvI+9wxGbZaoy4fD3hcW+XBkRkvu9RcHZebyznaJ1QOGwcQz2oCYVtU6aiPESF0n4iD2S6mZDwQmGaEvWJzCfDekR4dVYK2ySR1J8U6k26r/mmVsreGfAvTO+qELtjFNu02CaCGxcYOO43DHZ0vbJw3sN84jhxJ0lve0bjiXH/78EC0c8xPB9FEoyD4XijkcihkNLjaMjEAe5qTdMdelhVJZ8huXkc0zesNfeLTtny5rnCYLID1PG71/cH0oB73Cr6A8Lp+S2IgDiZ3hrjzSbHFlSsYhvpIvF3WcqSK7KQxtJQlYkF66nYD1irdMd8E0wpo3LRwx+iaYl4D3cKFjOFAgWcvVEXnpiUkusnsuDxf99ZVLjORwfLGH6hW9wdMYjX8bTW8YaYEguvyiKtN9atYjzKoMD9UXlO3Q8XZyw9afrA3aHYClf8fsiPWRqlhWFuIlX6uqGUIkiMkoMS2ivAlMoFWaZZl+/lH0cEg/dkoEcQGye9QDjCWX/OoWlS99p/bR+ycXp79x+uGJHeBSTps0h3QVDAQkDR16xxyO/ptDcjb7zFcZIjvAhNnwi5+QAul3KVh+P3Kwtw9Loc3xcTrbOevs3SHvnYqz8xMbj2DdT9vUj4MkoP5m9UWI+Y9kTjdTDwUl3FRIFq5IaxYxEeyw3wd7gX CUr308qd9Td5MpW/5c2qNXo+9KaVYBCStETU6coIW7oiuby6XwqxHY4xuXwS4wLBZguHT7E5nAl5yz8okwA9E/eGU1b+N7TZrmpMHF7zAwIplRQEZsUYUz9xogrvGsuPPYBnq0AzCk4eOjLLgy/GKtX2BWuLQqRshPj6/gozU2bcj4N4P8j9pcZM0A9fgQnn3MfApDhbPQF4XmIOy+6sU+enAJEgFSwOjO4UHnrye9A12zbDQ8TyaNow3G3Ddqu8YHChUGwOMNMQa+2V5tpCexfx3b/COxgfUUNumxenap6xIB5ssB/T8hZN/j8siWXyTvVmybuYO88K/PqA0sw/5QT6dJwOvwqEbkUetZEhlVyTV/bASqbZkhsbX2l07GabOFQx2eP8gdtS46SAJb58Pu7vYkBaeLCB0990GD0c+RhrwRANXDbS6u9clglHSu+/r6bxBwavwJ0Aq00UJckKh/RoVLTc4QuU7gMaynMB+f5KTLVGCQsBmobQrpMszrT9LyUlXr86NPw/ueIXqupCGsICrv9KuDTF9OKxQxbHza8E+BFpL852vNJslDCbMpa4bBou5nbpJmfXpgwi6bdkGUMC4KtXLEwDGpl5hbRocTK4xAeNWXSTxAYVy2YFF9cDLhHRpB Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a12-20020a50c30c000000b00561bbb13e37si270782edb.684.2024.02.11.16.03.55; Sun, 11 Feb 2024 16:03:56 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=SMbBMgBy; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4B79B68D1D9; Mon, 12 Feb 2024 02:02:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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: RisKlIxYtfKbnPclf4v25MH90B7RyPThiQ8pNubDyqOwze36R7OpIqS8JbQSOjUd5YSK950QL3UXrfiQaiEGXeLqqADrfeF5DOhgMzZWf02gHt+lx3PADdm2rroKVz/yDGSMrg3PCl/aL4tkQvKVXZ/YwpwyYVAwU7TNHNYNgeuF+KyrkFGuuPxPiufp1q+HnPw72PYlkc9iPZyvUI+jEW1AtrEam8kQWf90nQIMNyMJyekRKpF3sNkf63LukkZusLeK2Fu4NB0r2is8NoXBeJKeirLJ6oyJz/Fj3q98I1mp21biceFXiM3cH1yE8n1rzWoPXt00vFxx0WIR9Qzc9VImXiAxDFKUzLRaTjC5syF3wufooN/X7xqMCruolUvNkTVXrXAum6gYfeIHWXLsLv4mwjJHeSbN3z6LBHcINwl7jF952ICLrwJLnnwBGg28g5tiCjh5jpA1q3INF+LECjtpYewsIwoF+J4bBvJ9F0UJUldU4Xq92vfBpCmRV+2yVc0ANZD+le7iQfF/yGM3Bl9qbiIikjLCtoxZwThb4BawUuk48WTlrFEDwnUjYqj60yAlpTAiMtbPAS1dXhYo7i54oWsbd/j/iS+5yC2YLf7v7qvQkyy1dvVBk5wcJEGEgqE44DR9Fwhr9655tVRcHAQNYs8JHmDlGzW30Q1Ph+1H9mR9NSCpQ6WL5APozkaPospbq48Dt2yvH/WVvQ2EH7Bf8s9GEFAOG3/+SqrtBENJFD4c52HR2k6kH9m05rKPYrJf2clZPCVTik9zc3awFqTZQx92W3waJSFcXN09plJM/JDOpUoewe4hOe7HNBXHc2oIUsNxH6oM05v/a7/jp/A7py54algZOpWcByUwbjQiEK5SXiUm8A/wf4m58KGRKXDrN/dckXSj8iwdbbCV3La3DKJvc7TukZBnJI1wFKjfXtEdokl/B03wMSRCZuB8+4fJzVUy3FY2FjkDeMgO1D+d7kmb7qVtFMSPbEWrLnd8fzfIa3IWq8E8IXnG8WboZb3/Ywd7kMK9S/Dai19wpXpkRjOetHLA/LL+ZxlMORHFG91v0uBfShG4AolY7UKCLSafniZ/ia+hH200UlR51MD67rMCig5pxWeuMevyUqdHZajYx9KJEvmLyU67JsH+9+c0QhEhEPSZJTXw+/Zzz4DHdbJ3tKKkGm9EwCSEYcc9BYVqq+4E0XvxJTLGG+AuH/gNUt4UQVb6wxJv5vkYXG8Q0RXkqj1RZv7iU3R+3mbhVkhH+/qTmJGH7jK581vdZ8hRESldOVDNYrH9s8ku8Q== 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: HvFHogN8B80J 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,