From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id B7F0D4C3A3 for ; Thu, 4 Sep 2025 14:44:41 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'60VY/anETofkwCVPNE0OLaaVVmU6jAsR4UKZsWxuFn8=', expected b'S+HF0cgVEIBpFO2w6vd4zYhbMpZDfZD1YAV4GKktR2E=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1756997070; h=mime-version : to : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=60VY/anETofkwCVPNE0OLaaVVmU6jAsR4UKZsWxuFn8=; b=cXtQMzrVqhKLTSPkwUSyY7y6CXZew8AfjVOdWOzLG2WYBOLN1Y8GR74yT6bJcEFvRZ9FN rJH3uujgJsikkpRNsqUD6fwHw0fzeKGVXi14oRL5ihZc+sWYD328z3wYcIt8KTS+mRFnbbO DMP/kj/GWB7MHB+PkIzDkDUmPlnKPcX560lhEYBsLXxJ9m2LU8tpfqpHlCm3ulHbFTT3h92 TOHuYNi7dvbrPgx/cjzONCMIFGBKRlLbTFNGQYprPGHd/Ps9SJeZQBkdBqP7kTXYqKP/5TH +ZpVoZDI2p8NzfHAhKo33eHUXKUfEz+sJWJP0GdyK+5Pl/gKaLnH9tQ01+gQ== Received: from [172.19.0.4] (unknown [172.19.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 8544368E7A5; Thu, 4 Sep 2025 17:44:30 +0300 (EEST) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1756997070; b=J3LuMqh/EJIwtrHpfcTEq3ELNlJ1A4Essvr3AI1qrfEGGcS8FfSPW5Hiju1WXvHw8Llyo mJTSnXFfvo8mL3nkymSsrHiyL2w1Y/F/NVeWqo0SynSfIjCt2OqLhtWdb7bR2VViOLmnt9a fIGjkeUTQUAE3xWS5ze9CgidFVUHAkRXUdGsplXQIz48HCPXBfVs57B5wCBu7mylF+F0Nuv cjEvzsX66PToPmiSqQ1rYC3wny3zUuVZ4+CrdDd2tTxn0zlASLHRPuSRJ8h9QS9sZb1tgHY 3AIVx9HdmXMDRZqw/VYoXqZCVa7JN+FqN14F0GyRgoJIQAe2KgLUwGCdhOuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1756997070; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=AVBlLSjF2ba1B1waAOwAq9A7+X+TR/7+JW2xCFdo5vY=; b=YV6d44l05oKlpkmPOVptIADh82hymppouTMnLi4TeGGfkxQ0Npfk6MI+Hn7GSy3BN1j2B Sn/eY87XOvl6CgM2PkpdtAmPPqn+ygt6dyk41lMYpVovzL264PTlel5mbYfd/AnY09rMfmq T5yb9x0p9Fmc6Mg0BDf/7i0LrmTK6eKuw1A33LJE6QcmD6Nd9j6jCkG58c9Od91cwhU3pf3 KWBY+xpAaw6tYD5LlejNxojTN8+uhT5Ju1XZun00X6CUNSecoGqcPY9Bxe4ThK9KzecX207 IAqrjT2QsRj3piJJVExVW3BKDuQZNdjMr6xPQ1t3FiKgt9YmY6+KDJW3KmCA== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=none Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1756997060; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : from; bh=S+HF0cgVEIBpFO2w6vd4zYhbMpZDfZD1YAV4GKktR2E=; b=vjWiQYi7043xErA0LZjdWTSMNn3JcWBHJnq3iSbDOFHaas82rICAixNbmz6FwmwvKbAUu sWNrarhfmFjnanHAIGhUpcCp48WF91E+ei7IHXLZJwYsm5JneA8pFIKmcFrDIYYjl4aPS0S AZ4q05UWgJErK+Wz+p5Thxk6wx50vfLWHpKGKXZYVCAQmlR8rglxMi/HZO09W0sKH5/aalZ wqYmIqI3nTZ0pbb+0IMgRxUdAzNrUeJsK281NNbQ7nn8QQi01UrMQB1prz/AqLa5Ec0ZaNl IXZjshiLRlJRuYvSzsS4cDma9f/eMBbKBzSpqgHUZKhY97nj1dog3zI20Xbw== Received: from 5d8f51c41678 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id E3A8868E793 for ; Thu, 4 Sep 2025 17:44:20 +0300 (EEST) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Message-ID: <175699706109.25.10587263434704648641@463a07221176> Message-ID-Hash: O2M7UMDAQOWE36R7RGRHEOUEZIYX4Z4B X-Message-ID-Hash: O2M7UMDAQOWE36R7RGRHEOUEZIYX4Z4B X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avutil/hwcontext_d3d12va: added resource and heap flags to DeviceContext (PR #20437) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: jianhuaw via ffmpeg-devel Cc: jianhuaw Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #20437 opened by jianhuaw URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20437 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20437.patch >>From mailing list: https://patchwork.ffmpeg.org/project/ffmpeg/patch/20250723121006.1047-1-ovchinnikov.dmitrii@gmail.com/ Added some changes for APIChange. >>From 9c7b425b4344209e43bc06b5bccf4c2e3533a493 Mon Sep 17 00:00:00 2001 From: Dmitrii Ovchinnikov Date: Wed, 23 Jul 2025 14:10:06 +0200 Subject: [PATCH] avutil/hwcontext_d3d12va: added resource and heap flags to DeviceContext --- doc/APIchanges | 4 ++++ libavutil/hwcontext_d3d12va.c | 17 +++++++++++++++-- libavutil/hwcontext_d3d12va.h | 28 ++++++++++++++++++++++++++++ libavutil/version.h | 2 +- 4 files changed, 48 insertions(+), 3 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index d69aaf2215..5f5e8df933 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,10 @@ The last version increases of all libraries were on 2025-03-28 API changes, most recent first: +2025-09-xx - xxxxxxxxxx - lavu 60.13.100 - hwcontext_d3d12va.h + Add resource_flags and heap_flags to AVD3D12VADeviceContext + Add heap_flags to AVD3D12VAFramesContext + 2025-09-xx - xxxxxxxxxx - lavu 60.12.100 - hwcontext_d3d12va.h Add support for texture array mode AVD3D12VAFrame.subresource_index, AVD3D12VAFramesContext.texture_array diff --git a/libavutil/hwcontext_d3d12va.c b/libavutil/hwcontext_d3d12va.c index 9368341d6d..cde0a736c3 100644 --- a/libavutil/hwcontext_d3d12va.c +++ b/libavutil/hwcontext_d3d12va.c @@ -301,7 +301,7 @@ static AVBufferRef *d3d12va_pool_alloc(void *opaque, size_t size) if (!frame) return NULL; - if (FAILED(ID3D12Device_CreateCommittedResource(device_hwctx->device, &props, D3D12_HEAP_FLAG_NONE, &desc, + if (FAILED(ID3D12Device_CreateCommittedResource(device_hwctx->device, &props, hwctx->heap_flags, &desc, D3D12_RESOURCE_STATE_COMMON, NULL, &IID_ID3D12Resource, (void **)&frame->texture))) { av_log(ctx, AV_LOG_ERROR, "Could not create the texture\n"); goto fail; @@ -355,7 +355,8 @@ static int d3d12va_texture_array_init(AVHWFramesContext *ctx) static int d3d12va_frames_init(AVHWFramesContext *ctx) { - AVD3D12VAFramesContext *hwctx = ctx->hwctx; + AVD3D12VAFramesContext *hwctx = ctx->hwctx; + AVD3D12VADeviceContext *device_hwctx = ctx->device_ctx->hwctx; int i; for (i = 0; i < FF_ARRAY_ELEMS(supported_formats); i++) { @@ -379,6 +380,9 @@ static int d3d12va_frames_init(AVHWFramesContext *ctx) return err; } + hwctx->resource_flags |= device_hwctx->resource_flags; + hwctx->heap_flags |= device_hwctx->heap_flags; + ffhwframesctx(ctx)->pool_internal = av_buffer_pool_init2(sizeof(AVD3D12VAFrame), ctx, d3d12va_pool_alloc, NULL); @@ -754,6 +758,15 @@ static int d3d12va_device_create(AVHWDeviceContext *hwdev, const char *device, } } + if (av_dict_get(opts, "UAV", NULL, 0)) + ctx->resource_flags |= D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS; + + if (av_dict_get(opts, "RTV", NULL, 0)) + ctx->resource_flags |= D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET; + + if (av_dict_get(opts, "SHARED", NULL, 0)) + ctx->heap_flags |= D3D12_HEAP_FLAG_SHARED; + return 0; } diff --git a/libavutil/hwcontext_d3d12va.h b/libavutil/hwcontext_d3d12va.h index 1530de8b3c..adbec88173 100644 --- a/libavutil/hwcontext_d3d12va.h +++ b/libavutil/hwcontext_d3d12va.h @@ -75,6 +75,26 @@ typedef struct AVD3D12VADeviceContext { void (*lock)(void *lock_ctx); void (*unlock)(void *lock_ctx); void *lock_ctx; + + /** + * Resource flags to be applied to D3D12 resources allocated + * for frames using this device context. + * + * If unset, this will be D3D12_RESOURCE_FLAG_NONE. + * + * It applies globally to all AVD3D12VAFramesContext allocated from this device context. + */ + D3D12_RESOURCE_FLAGS resource_flags; + + /** + * Heap flags to be applied to D3D12 resources allocated + * for frames using this device context. + * + * If unset, this will be D3D12_HEAP_FLAG_NONE. + * + * It applies globally to all AVD3D12VAFramesContext allocated from this device context. + */ + D3D12_HEAP_FLAGS heap_flags; } AVD3D12VADeviceContext; /** @@ -164,6 +184,14 @@ typedef struct AVD3D12VAFramesContext { */ D3D12_RESOURCE_FLAGS resource_flags; + /** + * Options for working with heaps allocation when creating resources. + * If unset, this will be D3D12_HEAP_FLAG_NONE. + * + * @see https://learn.microsoft.com/en-us/windows/win32/api/d3d12/ne-d3d12-d3d12_heap_flags + */ + D3D12_HEAP_FLAGS heap_flags; + /** * In texture array mode, the D3D12 uses the same texture array (resource)for all * pictures. diff --git a/libavutil/version.h b/libavutil/version.h index 99ca75bb16..1099715076 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 60 -#define LIBAVUTIL_VERSION_MINOR 12 +#define LIBAVUTIL_VERSION_MINOR 13 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org