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 D0C7D4A536 for ; Tue, 20 May 2025 15:06:44 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id A974F68D7A4; Tue, 20 May 2025 18:06:40 +0300 (EEST) Received: from MEUPR01CU001.outbound.protection.outlook.com (mail-australiasoutheastazolkn19010003.outbound.protection.outlook.com [52.103.73.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id A733368D542 for ; Tue, 20 May 2025 18:06:32 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=riI0gRMzHEiDfS+F7Ib46Y/I02tYl+59XYkADo1SXEaLhLtIAbYYVPGsyX8TBdLZWKgZh31n2efbFYXWzhmYq2EaN6KL5xm8aPEe4otHmSkqkWEpVuociyU27O0sJ5u90UIodg1FfJF/uispMZdgrP0rF/mMYIyYH6TkxawvQ2Ekiwv2zjln4tPDB+SbHuXIWk/e0F35Z5FrCcVBJvu7nTm3gFsCkUk2bTz6NwvUCuYanIlqu2ApuaBtJvKov3lLnW/8Qe+bGzWt+KAVZvNfQk7LYLFcEhTdLAAKWzIwf/iUGaYrnBnTWfWcTJFScQMzck5ho0+iEEzv254dZOx2Cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=9T4Gj4aFlchmM59x7qJR10OYZmDHJSrJuPNI1T+Qg4I=; b=YhzwK33ppjETYUXL6jmCOtmghmYzbJcXeQpfncQEEHJRBkFXkcnvYEIl/XG+50PT/SCGOBAtgZljgTpZJCeJMa3mm+Ji/zFE5GzOL+sYUBZBkONpwMvAoC7L4OuymYai/U8Yy8sSb6sbV8Fp/phYXxyJAcvW6Cdrs/STukJh4N4QznoXnnVTbo7L1skail4nXRrawh90YQKlgGcf5W5wrDyjiFIiJ6IHzkLqKGymiUVVRoZecrEJp9noBzH3CPEWyvyayqN3pbjcYCfcyQt1NIzxSpNiKWZjcPbd9acswqKj1N5QoZtBZ2V9Mk6n7dlKQI9UFw17woeJj1cerNtr2Q== 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=9T4Gj4aFlchmM59x7qJR10OYZmDHJSrJuPNI1T+Qg4I=; b=lIWb7lHHI99wXAJwHAAbksI26D7MG3Frg9wQnPSIsr45IMGuiDflV6Kg3n/wz6vlAg2YLxsBtdO8DUqSEFwJOD0tbJYU0Bc23pdDgX1MC8dVjQIpRgNUWkw9CciY0aFd//p3iauOsNGwfWK5LiYMl7/Rp2EUZDNNuEfjJVDKiUd0KA5cYjkUDiubFy07I9ALhDFy3hOSBrySkcsTcZEaquMUNlzhI3NQ12th2Sya1aPkshvyGmW6Lbor5tJ4WPgosE5eNZ8UqBykIDLRzEy+/VmUvaYodmgEVhHFCdRIwrzzs/v8mvVAkxJ7pKONykTI+3umKWqh70QtUEV6U3FvmQ== Received: from SY7P300MB0845.AUSP300.PROD.OUTLOOK.COM (2603:10c6:10:288::12) by SY0P300MB0148.AUSP300.PROD.OUTLOOK.COM (2603:10c6:10:24f::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8746.33; Tue, 20 May 2025 15:06:27 +0000 Received: from SY7P300MB0845.AUSP300.PROD.OUTLOOK.COM ([fe80::eaec:d3ce:9584:3e10]) by SY7P300MB0845.AUSP300.PROD.OUTLOOK.COM ([fe80::eaec:d3ce:9584:3e10%6]) with mapi id 15.20.8769.019; Tue, 20 May 2025 15:06:27 +0000 From: Tong Wu To: FFmpeg development discussions and patches Thread-Topic: [FFmpeg-devel] [PATCH, v2] avcodec/d3d12va_encode: texture array support for HEVC Thread-Index: AQHbxkcakvaDY46wKUq0cjFQF2SFmbPbpIZw Date: Tue, 20 May 2025 15:06:27 +0000 Message-ID: References: <20250516094356.372-1-Primeadvice@gmail.com> In-Reply-To: <20250516094356.372-1-Primeadvice@gmail.com> Accept-Language: en-US, zh-CN Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-ms-traffictypediagnostic: SY7P300MB0845:EE_|SY0P300MB0148:EE_ x-ms-office365-filtering-correlation-id: 9b68e04b-e69b-4f3a-0c5a-08dd97afe530 x-microsoft-antispam: BCL:0; ARA:14566002|8022599003|41001999006|8060799009|19110799006|15080799009|461199028|7092599006|8062599006|4302099013|3412199025|440099028|12091999003|10035399007|102099032|56899033|1602099012; x-microsoft-antispam-message-info: =?us-ascii?Q?kqBv22JkMo4rz5I1xkf0ELGJBDAxwXB3MfzXNx4pKU2vhdWpPGzk9zPnnrIi?= =?us-ascii?Q?j2DVp21vDWy0I01V4F28UOsQzhIOA22uxJFBXzbEt1rocTP65CfjOljyPE2I?= =?us-ascii?Q?Nb71wIhSoxYt1vqGV2Csxg4njyfMI4wxzTO6/mHWe791ew6HEWd34Gu1JDK8?= =?us-ascii?Q?PEX8OE6qN3JqLUacwKPD+m6RKAZXQ0go4RDRZ7geg5X/C3p+0Kxy9TpvjYg4?= =?us-ascii?Q?cb8RNSvgvXbBHrYG6mDt4vd7w2tw6dVp/KnSgzMc8Q7RXUGoPNWLzbUHHbZg?= =?us-ascii?Q?GJjJ/yyK4YScMKv7/2qp2djSQg5S5zi3mZGCx65m3cDJeTgeN+upVVRIjFja?= =?us-ascii?Q?yh1Eb01KhBuEoBj5VHGk8YTXRydNjjMzUDS/VMY+lQO9cRmfRfqMoX3Hwmfo?= =?us-ascii?Q?YUTcCpFCo7TY58XkkVZsGjySnzVDyObRAr8+J3XojmGJJEFV8FLwwXrD7k2B?= =?us-ascii?Q?Itik/SLcH8S57wh+VZdQ7RZauQ7HBiLEZUyCnB8ZzUy6tqjr4iFMHrvGebY0?= =?us-ascii?Q?VRRA7JTSfieGLXndGkHRvIsnG8nFj/TpUqBgK6HLJnLlk9HtPUJPHNuF8VH3?= =?us-ascii?Q?yjaJouqvwZmaPmgB4yA3JbvaBdk5eLRDGsAKenjjjNMggydHki+sbl3gEm5S?= =?us-ascii?Q?LkGSYpwo49JlzzfOJ5dmAzpqCXPqfpteePNOwXmicCOdvRyzrN6jXlRRD+l/?= =?us-ascii?Q?Cr0haVCkOGIbPO2kyub1B9XyeCRKKY0gt2coTQrbGM3z+OSGECEG4rlqnvo+?= =?us-ascii?Q?VjgOdx3YXwfQQgqAXw3EhfYSfEjchKHUz51fm421GtQy0ymf/Cj7ed/AwxSN?= =?us-ascii?Q?3ZBnINlOz15w241qTn+6pM34J5U0JHnYvIHKl+NEVY1691GVFGNrUVKLPUZV?= =?us-ascii?Q?Lvxzwzk6YaeU0fAA7mlCOVGfZN3yNBQ/TBrjYl1lxIWgx1IDFZnPXrM8twP3?= =?us-ascii?Q?M1KRjTlZbyOr25jXQfWlqcYatooAc5eUReUcQv+5nUz/erB49dAMmZR+2VDn?= =?us-ascii?Q?yYJb196QyNrF15KEklWNXHT34ik9xPOxhol+6HfN5B0z3iJ8k7GnrM++bFJS?= =?us-ascii?Q?DM4TmVcr+jQo3573vq71Zww4N1TDco7oSK/WH+SpQnNqE8ztjwp2gFKk0Lo3?= =?us-ascii?Q?6gtEVEjpU9tsxA7binmhD8QoGXU+EjUAWyhUOYFyDQMvoAPn7nCwY3RwHN2U?= =?us-ascii?Q?RtUEn87vPa58HDj3ujsjcA/T2JTREFYYY8jlWF92hQO7Qez6O6XyQ9Z68dcm?= =?us-ascii?Q?PtZO9Lo/ImAYtuwt5v0w19AWd4OjE839JTP62fxmCvfbcFdViZIAbu4OceuD?= =?us-ascii?Q?sDIGOqpEVL3e2c4YOlBMrsGI?= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?0KsgNlpLZHm7SWki1oceOM/e5tn25m5EMkdNNh4hv4OihfhkSS9k3MCK8AZ+?= =?us-ascii?Q?g5rf3Us8OJkoRnG7jdN7SgEMpm3rXoZNIEDXcog4AJs8YynJ18Q5KHA9P5Db?= =?us-ascii?Q?u8iMAj8govyfGrizwXqpHyJsYW5HoCjJn03RVgmzFC7YoLrNzEYTYkcdh4Gq?= =?us-ascii?Q?+ej4m/as5hul2u8M+WnRDD7D75tkKc2KZZTflnFDwBDMNtOkUdslwmV1844D?= =?us-ascii?Q?VVEqXJRZ4KRE73mof47bE5vadG2gcMWOdjY00iGpNfKSaHmIL2nVErU3T+Lf?= =?us-ascii?Q?xZi3uEz5Ov1No0f616csTXmC3+fZEqDTVVrwjLO7LRyk/o/RlDv5f9xY7n0d?= =?us-ascii?Q?fP861X/D+asxoSmP7Y7q+R396yBqsHffSdy/bDD3jPr5bMo9rSRTUYyFf/Mg?= =?us-ascii?Q?OSH0ezRXY0xoMZEQVQYjMKy8yU7n/PS3/gU73YXJH/5b9SR77kl59TFBymU4?= =?us-ascii?Q?rglGfwkKwtOQ6PKEB3XOtWW48ZwVRBKlK9eycb7ydv3fkM1be7AMj2iM4Gkh?= =?us-ascii?Q?9v+flFVXRUMmWjunitRgvGpT4FXD8mRYz5hufkgmv7p8hDSFPb/oSNQHfuOJ?= =?us-ascii?Q?qjRL+P+4cGBpRjwZ+Pz/gm3AntkkgEBPyA5YDdxP22oLKrUDH4VyLmSlRrbl?= =?us-ascii?Q?xl7BntplA3kY1zoHSxFGGO7Wjqr8h3iA6FZS2fWeBSgXfJQxxq044Aw0+aSf?= =?us-ascii?Q?6xJkwuay23doFfJkZS4SIvAAr3uL+pLrQNc1OwOQxLK+4KEGt4ykarVknayO?= =?us-ascii?Q?xxONXQsahlYAcrlFZrH7/mePXirZaKJ7Pq7UYnvkcNb9xwjCzCtUqdGTAJpS?= =?us-ascii?Q?t3Tdue2TEZlkCxZifsk+ElkAbHB7+bEG2F6SjGqhRXHm1tvl2vybltF9B6Mi?= =?us-ascii?Q?fx2Z0ZTHwwZGwouhgc8fdYlMhIlRuDKA2Hx2BpXkw0OrUSpNpQaB72hJqNHz?= =?us-ascii?Q?fCyxM4mJn/zQL9+blE0GKLxCGCfFmooPA24ydiyI5Wym2pX3YdM8Iu0jZrS1?= =?us-ascii?Q?HzYpyNa6lnc46aXshVWTOIo3FwDYyCDpJZKWO/+Vl3bgtl5iJKJsOoOvmHdV?= =?us-ascii?Q?fewqNFX0QB7YKHV/nnjscF4d+D11Bk2b8yF57FqbHEG3w6ieo2Ts24hp7DZS?= =?us-ascii?Q?u2uIXx2NfRWlGDQjuRnOXoV/9HDZQPxSkTqD69x4ElDDnSvNMDXMH8VYvtRt?= =?us-ascii?Q?R5MpME0SBWHyC+D3gahc5QXs71i/H8BiuMt4tssKdloAA7Qww3qQu8jkdsk?= =?us-ascii?Q?=3D?= MIME-Version: 1.0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SY7P300MB0845.AUSP300.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 9b68e04b-e69b-4f3a-0c5a-08dd97afe530 X-MS-Exchange-CrossTenant-originalarrivaltime: 20 May 2025 15:06:27.6060 (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: SY0P300MB0148 Subject: Re: [FFmpeg-devel] [PATCH, v2] avcodec/d3d12va_encode: texture array support for HEVC 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: Araz Iusubov 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: Araz Iusubov: > -----Original Message----- > From: ffmpeg-devel On Behalf Of Araz > Iusubov > Sent: Friday, May 16, 2025 5:44 PM > To: ffmpeg-devel@ffmpeg.org > Cc: Araz Iusubov > Subject: [FFmpeg-devel] [PATCH, v2] avcodec/d3d12va_encode: texture array > support for HEVC > > This patch adds support for the texture array feature used by AMD boards in the > D3D12 HEVC encoder. > In texture array mode, a single texture array is shared for all reference and > reconstructed pictures using different subresources. > The implementation ensures compatibility and has been successfully tested on > AMD, Intel, and NVIDIA GPUs. > > v2 updates: > 1. The reference to MaxL1ReferencesForB for the H.264 codec was updated to > use the corresponding H.264 field instead of the HEVC one. > 2. Max_subresource_array_size calculation was adjusted by removing the > D3D12VA_VIDEO_ENC_ASYNC_DEPTH offset. > > --- > libavcodec/d3d12va_encode.c | 241 +++++++++++++++++++++++++------ > libavcodec/d3d12va_encode.h | 29 ++++ > libavcodec/d3d12va_encode_hevc.c | 5 +- > 3 files changed, 231 insertions(+), 44 deletions(-) > > diff --git a/libavcodec/d3d12va_encode.c b/libavcodec/d3d12va_encode.c index > 4d738200fe..d428ad1fd8 100644 > --- a/libavcodec/d3d12va_encode.c > +++ b/libavcodec/d3d12va_encode.c > @@ -264,6 +264,11 @@ static int d3d12va_encode_issue(AVCodecContext > *avctx, > > av_log(avctx, AV_LOG_DEBUG, "Input surface is %p.\n", pic->input_surface- > >texture); > > + if (ctx->is_texture_array) { > + base_pic->recon_image->data[0] = ctx->texture_array_frame; > + pic->subresource_index = (ctx->subresource_used_index++) % ctx- > >max_subresource_array_size; > + } > + > pic->recon_surface = (AVD3D12VAFrame *)base_pic->recon_image->data[0]; > av_log(avctx, AV_LOG_DEBUG, "Recon surface is %p.\n", > pic->recon_surface->texture); @@ -325,11 +330,28 @@ static int > d3d12va_encode_issue(AVCodecContext *avctx, > goto fail; > } > > + if (ctx->is_texture_array) { > + d3d12_refs.pSubresources = av_calloc(d3d12_refs.NumTexture2Ds, > + sizeof(*d3d12_refs.pSubresources)); > + if (!d3d12_refs.pSubresources) { > + err = AVERROR(ENOMEM); > + goto fail; > + } > + } > + > i = 0; > - for (j = 0; j < base_pic->nb_refs[0]; j++) > - d3d12_refs.ppTexture2Ds[i++] = ((D3D12VAEncodePicture *)base_pic- > >refs[0][j]->priv)->recon_surface->texture; > - for (j = 0; j < base_pic->nb_refs[1]; j++) > - d3d12_refs.ppTexture2Ds[i++] = ((D3D12VAEncodePicture *)base_pic- > >refs[1][j]->priv)->recon_surface->texture; > + for (j = 0; j < base_pic->nb_refs[0]; j++) { > + d3d12_refs.ppTexture2Ds[i] = ((D3D12VAEncodePicture *)base_pic- > >refs[0][j]->priv)->recon_surface->texture; > + if (ctx->is_texture_array) > + d3d12_refs.pSubresources[i] = ((D3D12VAEncodePicture *)base_pic- > >refs[0][j]->priv)->subresource_index; > + i++; > + } > + for (j = 0; j < base_pic->nb_refs[1]; j++) { > + d3d12_refs.ppTexture2Ds[i] = ((D3D12VAEncodePicture *)base_pic- > >refs[1][j]->priv)->recon_surface->texture; > + if (ctx->is_texture_array) > + d3d12_refs.pSubresources[i] = ((D3D12VAEncodePicture *)base_pic- > >refs[1][j]->priv)->subresource_index; > + i++; > + } > } > > input_args.PictureControlDesc.IntraRefreshFrameIndex = 0; @@ -343,7 > +365,11 @@ static int d3d12va_encode_issue(AVCodecContext *avctx, > output_args.Bitstream.pBuffer = pic->output_buffer; > output_args.Bitstream.FrameStartOffset = pic- > >aligned_header_size; > output_args.ReconstructedPicture.pReconstructedPicture = pic- > >recon_surface->texture; > - output_args.ReconstructedPicture.ReconstructedPictureSubresource = 0; > + if (ctx->is_texture_array) { > + output_args.ReconstructedPicture.ReconstructedPictureSubresource = pic- > >subresource_index; > + } else { > + output_args.ReconstructedPicture.ReconstructedPictureSubresource = 0; > + } > output_args.EncoderOutputMetadata.pBuffer = pic- > >encoded_metadata; > output_args.EncoderOutputMetadata.Offset = 0; > > @@ -381,35 +407,87 @@ static int d3d12va_encode_issue(AVCodecContext > *avctx, > }, \ > } > > +#define TRANSITION_BARRIER_SUBRESOURCE(res, subres,before, after) \ > + (D3D12_RESOURCE_BARRIER) { \ > + .Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION, \ > + .Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE, \ > + .Transition = { \ > + .pResource = res, \ > + .Subresource = subres, \ > + .StateBefore = before, \ > + .StateAfter = after, \ > + }, \ > + } > + > barriers[0] = TRANSITION_BARRIER(pic->input_surface->texture, > D3D12_RESOURCE_STATE_COMMON, > D3D12_RESOURCE_STATE_VIDEO_ENCODE_READ); > barriers[1] = TRANSITION_BARRIER(pic->output_buffer, > D3D12_RESOURCE_STATE_COMMON, > D3D12_RESOURCE_STATE_VIDEO_ENCODE_WRITE); > - barriers[2] = TRANSITION_BARRIER(pic->recon_surface->texture, > + barriers[2] = TRANSITION_BARRIER(pic->encoded_metadata, > D3D12_RESOURCE_STATE_COMMON, > D3D12_RESOURCE_STATE_VIDEO_ENCODE_WRITE); > - barriers[3] = TRANSITION_BARRIER(pic->encoded_metadata, > + barriers[3] = TRANSITION_BARRIER(pic->resolved_metadata, > D3D12_RESOURCE_STATE_COMMON, > D3D12_RESOURCE_STATE_VIDEO_ENCODE_WRITE); > - barriers[4] = TRANSITION_BARRIER(pic->resolved_metadata, > - D3D12_RESOURCE_STATE_COMMON, > - D3D12_RESOURCE_STATE_VIDEO_ENCODE_WRITE); > - > - ID3D12VideoEncodeCommandList2_ResourceBarrier(cmd_list, 5, barriers); > - > - if (d3d12_refs.NumTexture2Ds) { > - D3D12_RESOURCE_BARRIER refs_barriers[3]; > - > - for (i = 0; i < d3d12_refs.NumTexture2Ds; i++) > - refs_barriers[i] = TRANSITION_BARRIER(d3d12_refs.ppTexture2Ds[i], > - D3D12_RESOURCE_STATE_COMMON, > - D3D12_RESOURCE_STATE_VIDEO_ENCODE_READ); > - > - ID3D12VideoEncodeCommandList2_ResourceBarrier(cmd_list, > d3d12_refs.NumTexture2Ds, > - refs_barriers); > + ID3D12VideoEncodeCommandList2_ResourceBarrier(cmd_list, 4, > + barriers); > + > + //set transit barriers for reference pic and recon pic > + int barriers_ref_index = 0; > + D3D12_RESOURCE_BARRIER *barriers_ref = NULL; > + if (ctx->is_texture_array) { > + barriers_ref = av_calloc(ctx->max_subresource_array_size * ctx- > >plane_count, > + sizeof(D3D12_RESOURCE_BARRIER)); > + } else { > + barriers_ref = > av_calloc(MAX_DPB_SIZE,sizeof(D3D12_RESOURCE_BARRIER)); > + } > + > + if (ctx->is_texture_array) { > + // In Texture array mode, the D3D12 uses the same texture array for all the > input > + // reference pics in ppTexture2Ds and also for the pReconstructedPicture > output allocations, > + //just different subresources. > + D3D12_RESOURCE_DESC references_tex_array_desc = { 0 }; > + > + pic->recon_surface->texture->lpVtbl->GetDesc(pic->recon_surface->textu > + re, &references_tex_array_desc); > + > + for (uint32_t reference_subresource = 0; reference_subresource < > references_tex_array_desc.DepthOrArraySize; > + reference_subresource++) { > + > + //D3D12 DecomposeSubresource > + uint32_t mip_slice, plane_slice, array_slice, array_size; > + array_size = references_tex_array_desc.DepthOrArraySize; > + mip_slice = reference_subresource % > references_tex_array_desc.MipLevels; > + array_slice = (reference_subresource / > + references_tex_array_desc.MipLevels) % array_size; > + > + for (plane_slice = 0; plane_slice < ctx->plane_count; plane_slice++) { > + //Calculate the subresource index > + uint32_t planeOutputSubresource = mip_slice + array_slice * > references_tex_array_desc.MipLevels + > + plane_slice * > + references_tex_array_desc.MipLevels * array_size; > + > + if (reference_subresource == pic->subresource_index) { > + barriers_ref[barriers_ref_index++] = > TRANSITION_BARRIER_SUBRESOURCE(pic->recon_surface->texture, > planeOutputSubresource, > + D3D12_RESOURCE_STATE_COMMON, > + D3D12_RESOURCE_STATE_VIDEO_ENCODE_WRITE); > + } else { > + barriers_ref[barriers_ref_index++] = > TRANSITION_BARRIER_SUBRESOURCE(pic->recon_surface->texture, > planeOutputSubresource, > + D3D12_RESOURCE_STATE_COMMON, > + D3D12_RESOURCE_STATE_VIDEO_ENCODE_READ); > + } > + } > + } > + } else { > + barriers_ref[barriers_ref_index++] = TRANSITION_BARRIER(pic- > >recon_surface->texture, > + D3D12_RESOURCE_STATE_COMMON, > + > + D3D12_RESOURCE_STATE_VIDEO_ENCODE_WRITE); > + > + if (d3d12_refs.NumTexture2Ds) { > + for (i = 0; i < d3d12_refs.NumTexture2Ds; i++) > + barriers_ref[barriers_ref_index++] = > TRANSITION_BARRIER(d3d12_refs.ppTexture2Ds[i], > + D3D12_RESOURCE_STATE_COMMON, > + > D3D12_RESOURCE_STATE_VIDEO_ENCODE_READ); > + } > } > + ID3D12VideoEncodeCommandList2_ResourceBarrier(cmd_list, > + barriers_ref_index, barriers_ref); > > ID3D12VideoEncodeCommandList2_EncodeFrame(cmd_list, ctx->encoder, ctx- > >encoder_heap, > &input_args, &output_args); @@ -422,16 +500,15 @@ > static int d3d12va_encode_issue(AVCodecContext *avctx, > > > ID3D12VideoEncodeCommandList2_ResolveEncoderOutputMetadata(cmd_list, > &input_metadata, &output_metadata); > > - if (d3d12_refs.NumTexture2Ds) { > - D3D12_RESOURCE_BARRIER refs_barriers[3]; > - > - for (i = 0; i < d3d12_refs.NumTexture2Ds; i++) > - refs_barriers[i] = TRANSITION_BARRIER(d3d12_refs.ppTexture2Ds[i], > - D3D12_RESOURCE_STATE_VIDEO_ENCODE_READ, > - D3D12_RESOURCE_STATE_COMMON); > - > - ID3D12VideoEncodeCommandList2_ResourceBarrier(cmd_list, > d3d12_refs.NumTexture2Ds, > - refs_barriers); > + //swap the barriers_ref transition state > + if (barriers_ref_index > 0) { > + for (i = 0; i < barriers_ref_index; i++) { > + D3D12_RESOURCE_STATES temp_statue = > barriers_ref[i].Transition.StateBefore; > + barriers_ref[i].Transition.StateBefore = > barriers_ref[i].Transition.StateAfter; > + barriers_ref[i].Transition.StateAfter = temp_statue; > + } > + ID3D12VideoEncodeCommandList2_ResourceBarrier(cmd_list, > barriers_ref_index, > + barriers_ref); > } > > barriers[0] = TRANSITION_BARRIER(pic->input_surface->texture, > @@ -440,17 +517,14 @@ static int d3d12va_encode_issue(AVCodecContext > *avctx, > barriers[1] = TRANSITION_BARRIER(pic->output_buffer, > D3D12_RESOURCE_STATE_VIDEO_ENCODE_WRITE, > D3D12_RESOURCE_STATE_COMMON); > - barriers[2] = TRANSITION_BARRIER(pic->recon_surface->texture, > - D3D12_RESOURCE_STATE_VIDEO_ENCODE_WRITE, > - D3D12_RESOURCE_STATE_COMMON); > - barriers[3] = TRANSITION_BARRIER(pic->encoded_metadata, > + barriers[2] = TRANSITION_BARRIER(pic->encoded_metadata, > D3D12_RESOURCE_STATE_VIDEO_ENCODE_READ, > D3D12_RESOURCE_STATE_COMMON); > - barriers[4] = TRANSITION_BARRIER(pic->resolved_metadata, > + barriers[3] = TRANSITION_BARRIER(pic->resolved_metadata, > D3D12_RESOURCE_STATE_VIDEO_ENCODE_WRITE, > D3D12_RESOURCE_STATE_COMMON); > > - ID3D12VideoEncodeCommandList2_ResourceBarrier(cmd_list, 5, barriers); > + ID3D12VideoEncodeCommandList2_ResourceBarrier(cmd_list, 4, > + barriers); > > hr = ID3D12VideoEncodeCommandList2_Close(cmd_list); > if (FAILED(hr)) { > @@ -489,6 +563,14 @@ static int d3d12va_encode_issue(AVCodecContext > *avctx, > if (d3d12_refs.ppTexture2Ds) > av_freep(&d3d12_refs.ppTexture2Ds); > > + if (ctx->is_texture_array) { > + if (d3d12_refs.pSubresources) > + av_freep(&d3d12_refs.pSubresources); > + } > + > + if (barriers_ref) > + av_freep(&barriers_ref); > + > return 0; > > fail: > @@ -498,6 +580,14 @@ fail: > if (d3d12_refs.ppTexture2Ds) > av_freep(&d3d12_refs.ppTexture2Ds); > > + if (ctx->is_texture_array) { > + if (d3d12_refs.pSubresources) > + av_freep(&d3d12_refs.pSubresources); > + } > + > + if (barriers_ref) > + av_freep(&barriers_ref); > + > if (ctx->codec->free_picture_params) > ctx->codec->free_picture_params(pic); > > @@ -1088,13 +1178,15 @@ static int > d3d12va_encode_init_gop_structure(AVCodecContext *avctx) > switch (ctx->codec->d3d12_codec) { > case D3D12_VIDEO_ENCODER_CODEC_H264: > ref_l0 = FFMIN(support.PictureSupport.pH264Support- > >MaxL0ReferencesForP, > - support.PictureSupport.pH264Support- > >MaxL1ReferencesForB); > + support.PictureSupport.pH264Support- > >MaxL1ReferencesForB ? > + > + support.PictureSupport.pH264Support->MaxL1ReferencesForB : UINT_MAX); > ref_l1 = support.PictureSupport.pH264Support->MaxL1ReferencesForB; > break; > > case D3D12_VIDEO_ENCODER_CODEC_HEVC: > ref_l0 = FFMIN(support.PictureSupport.pHEVCSupport- > >MaxL0ReferencesForP, > - support.PictureSupport.pHEVCSupport- > >MaxL1ReferencesForB); > + support.PictureSupport.pHEVCSupport- > >MaxL1ReferencesForB ? > + > + support.PictureSupport.pHEVCSupport->MaxL1ReferencesForB : UINT_MAX); > ref_l1 = support.PictureSupport.pHEVCSupport->MaxL1ReferencesForB; > break; > > @@ -1336,6 +1428,47 @@ fail: > return err; > } > > +static int d3d12va_create_texture_array(AVHWFramesContext *ctx, > +D3D12VAEncodeContext *encode_context) { > + AVD3D12VAFramesContext *hwctx = ctx->hwctx; > + AVD3D12VADeviceContext *device_hwctx = ctx->device_ctx->hwctx; > + > + AVD3D12VAFrame *frame; > + D3D12_HEAP_PROPERTIES props = { .Type = D3D12_HEAP_TYPE_DEFAULT }; > + > + encode_context->max_subresource_array_size = MAX_DPB_SIZE + 1; > + > + D3D12_RESOURCE_DESC desc = { > + .Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D, > + .Alignment = 0, > + .Width = ctx->width, > + .Height = ctx->height, > + .DepthOrArraySize = encode_context->max_subresource_array_size, > + .MipLevels = 1, > + .Format = hwctx->format, > + .SampleDesc = {.Count = 1, .Quality = 0 }, > + .Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN, > + .Flags = hwctx->flags, > + }; > + > + frame = av_mallocz(sizeof(AVD3D12VAFrame)); > + if (!frame) > + return AVERROR(ENOMEM); > + > + if (FAILED(ID3D12Device_CreateCommittedResource(device_hwctx->device, > &props, D3D12_HEAP_FLAG_NONE, &desc, > + D3D12_RESOURCE_STATE_COMMON, NULL, &IID_ID3D12Resource, (void > **)&frame->texture))) { > + av_log(ctx, AV_LOG_ERROR, "Could not create the texture\n"); > + return AVERROR(EINVAL); > + } > + > + ID3D12Device_CreateFence(device_hwctx->device, 0, > D3D12_FENCE_FLAG_NONE, > + &IID_ID3D12Fence, (void > + **)&frame->sync_ctx.fence); > + > + frame->sync_ctx.event = CreateEvent(NULL, FALSE, FALSE, NULL); > + encode_context->texture_array_frame = frame; > + return 0; > +} > + > static int d3d12va_encode_create_recon_frames(AVCodecContext *avctx) { > FFHWBaseEncodeContext *base_ctx = avctx->priv_data; @@ -1394,6 +1527,7 > @@ int ff_d3d12va_encode_init(AVCodecContext *avctx) > FFHWBaseEncodeContext *base_ctx = avctx->priv_data; > D3D12VAEncodeContext *ctx = avctx->priv_data; > D3D12_FEATURE_DATA_VIDEO_FEATURE_AREA_SUPPORT support = { 0 }; > + D3D12_FEATURE_DATA_FORMAT_INFO format_info = {0}; > int err; > HRESULT hr; > > @@ -1429,6 +1563,15 @@ int ff_d3d12va_encode_init(AVCodecContext *avctx) > goto fail; > } > > + format_info.Format = ((AVD3D12VAFramesContext*)base_ctx->input_frames- > >hwctx)->format; > + if (FAILED(ID3D12VideoDevice_CheckFeatureSupport(ctx->hwctx->device, > D3D12_FEATURE_FORMAT_INFO, > + &format_info, sizeof(format_info)))) { > + av_log(avctx, AV_LOG_ERROR, "Failed to query format plane count: > 0x%x\n", hr); > + err = AVERROR_EXTERNAL; > + goto fail; > + } > + ctx->plane_count = format_info.PlaneCount; > + > err = d3d12va_encode_set_profile(avctx); > if (err < 0) > goto fail; > @@ -1485,6 +1628,10 @@ int ff_d3d12va_encode_init(AVCodecContext *avctx) > goto fail; > } > > + if (ctx->is_texture_array) { > + d3d12va_create_texture_array(base_ctx->recon_frames, avctx- > >priv_data); > + } > + > base_ctx->output_delay = base_ctx->b_per_p; > base_ctx->decode_delay = base_ctx->max_b_depth; > > @@ -1528,6 +1675,18 @@ int ff_d3d12va_encode_close(AVCodecContext > *avctx) > > av_buffer_pool_uninit(&ctx->output_buffer_pool); > > + if (ctx->is_texture_array) { > + ID3D12Resource *pResource = ctx->texture_array_frame->texture; > + if (pResource) { > + D3D12_OBJECT_RELEASE(pResource); > + ctx->texture_array_frame->texture = NULL; > + } > + D3D12_OBJECT_RELEASE(ctx->texture_array_frame->sync_ctx.fence); > + if (ctx->texture_array_frame->sync_ctx.event) > + CloseHandle(ctx->texture_array_frame->sync_ctx.event); > + av_free(ctx->texture_array_frame); > + } > + > D3D12_OBJECT_RELEASE(ctx->command_list); > D3D12_OBJECT_RELEASE(ctx->command_queue); > > diff --git a/libavcodec/d3d12va_encode.h b/libavcodec/d3d12va_encode.h index > 3b0b8153d5..fc31857f1a 100644 > --- a/libavcodec/d3d12va_encode.h > +++ b/libavcodec/d3d12va_encode.h > @@ -52,6 +52,8 @@ typedef struct D3D12VAEncodePicture { > ID3D12Resource *encoded_metadata; > ID3D12Resource *resolved_metadata; > > + int subresource_index; > + > D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA pic_ctl; > > int fence_value; > @@ -189,6 +191,33 @@ typedef struct D3D12VAEncodeContext { > */ > AVBufferPool *output_buffer_pool; > > + /** > + * Flag indicates if the HW is texture array mode. > + */ > + int is_texture_array; > + > + /** > + * In texture array mode, the D3D12 uses the same texture array for all the > input > + * reference pics in ppTexture2Ds and also for the pReconstructedPicture > output > + * allocations, just different subresources. > + */ > + AVD3D12VAFrame *texture_array_frame; > + > + /** > + * The max number of subresources in the texture array. > + */ > + int max_subresource_array_size; > + > + /** > + * The used subresource index for pic in the texture array. > + */ > + int subresource_used_index; > + > + /** > + * The number of planes in the input DXGI FORMAT . > + */ > + int plane_count; > + > /** > * D3D12 video encoder. > */ > diff --git a/libavcodec/d3d12va_encode_hevc.c > b/libavcodec/d3d12va_encode_hevc.c > index 938ba01f54..7e1d973f7e 100644 > --- a/libavcodec/d3d12va_encode_hevc.c > +++ b/libavcodec/d3d12va_encode_hevc.c > @@ -280,9 +280,8 @@ static int > d3d12va_encode_hevc_init_sequence_params(AVCodecContext *avctx) > } > > if (support.SupportFlags & > D3D12_VIDEO_ENCODER_SUPPORT_FLAG_RECONSTRUCTED_FRAMES_REQUIR > E_TEXTURE_ARRAYS) { > - av_log(avctx, AV_LOG_ERROR, "D3D12 video encode on this device requires > texture array support, " > - "but it's not implemented.\n"); > - return AVERROR_PATCHWELCOME; > + ctx->is_texture_array = 1; > + av_log(avctx, AV_LOG_DEBUG, "D3D12 video encode on this device > + uses texture array mode.\n"); > } > > desc = av_pix_fmt_desc_get(base_ctx->input_frames->sw_format); > -- Hi Araz, Could you please fix the compile error for gcc compiler and resubmit another version? https://patchwork.ffmpeg.org/project/ffmpeg/patch/20250516094356.372-1-Primeadvice@gmail.com/ Tong _______________________________________________ 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".