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 420E44C4FB for ; Sun, 28 Jul 2024 15:55:16 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7D97268D8B9; Sun, 28 Jul 2024 18:55:14 +0300 (EEST) Received: from vidala.lynne.ee (vidala.pars.ee [116.203.72.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6B16568D517 for ; Sun, 28 Jul 2024 18:55:07 +0300 (EEST) Message-ID: Date: Sun, 28 Jul 2024 17:55:03 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20240708151323.312-1-wutong1208@outlook.com> Content-Language: en-US Autocrypt: addr=dev@lynne.ee; keydata= xjMEXnFG3BYJKwYBBAHaRw8BAQdA3FyJpqEdfQj4GA7OUWVrNheT9dUsIs+yUx6Hljr9mYvN FEx5bm5lIDxkZXZAbHlubmUuZWU+wpAEExYIADgWIQT+UBOcaAVyyv1SH42i/qXwPwNEZAUC XnFG3AIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRCi/qXwPwNEZOTWAQCSNEA+kZLI NZ2dsR5Qg988c0HXpOXThZEjg+h1TL7KGgEA3Gff0c28efI02S6iMxazrpdWGHqHk7JN7pCj nt397wzOOARecUbcEgorBgEEAZdVAQUBAQdAjDdFQ5H+AJ9vwXrOb7val460g45EsheIaL5S 7/zSaX8DAQgHwngEGBYIACAWIQT+UBOcaAVyyv1SH42i/qXwPwNEZAUCXnFG3AIbDAAKCRCi /qXwPwNEZKaxAQCHLV4gAk/B9JvRG27MYm22X3+5QRCLBtEILP29aDh+MQD/V8JFHATDXRY3 0LsmqR3sPQ0BJ1UFVZA5BUoIJPJZWwg= In-Reply-To: Subject: Re: [FFmpeg-devel] [PATCH 2/2] lavc/d3d12va_encode: trim header alignment at output 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: , From: Lynne via ffmpeg-devel Reply-To: FFmpeg development discussions and patches Cc: Lynne Content-Type: multipart/mixed; boundary="===============8005532578764063802==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --===============8005532578764063802== Content-Language: en-US Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------Ul2rz1Rq2qbfVlfjNom5XXgY" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------Ul2rz1Rq2qbfVlfjNom5XXgY Content-Type: multipart/mixed; boundary="------------bcXMwnQK3CihymOoSf70xEfb"; protected-headers="v1" From: Lynne To: ffmpeg-devel@ffmpeg.org Message-ID: Subject: Re: [FFmpeg-devel] [PATCH 2/2] lavc/d3d12va_encode: trim header alignment at output References: <20240708151323.312-1-wutong1208@outlook.com> In-Reply-To: --------------bcXMwnQK3CihymOoSf70xEfb Content-Type: multipart/mixed; boundary="------------CV8gdIPOAcs38dq59x2e4Weo" --------------CV8gdIPOAcs38dq59x2e4Weo Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 28/07/2024 15:06, Tong Wu wrote: > Tong Wu: >> Subject: [FFmpeg-devel][PATCH 2/2] lavc/d3d12va_encode: trim header >> alignment at output >> >> It is d3d12va's requirement that the FrameStartOffset must be aligned as per >> hardware limitation. However, we could trim this alignment at output to reduce >> coded size. A aligned_header_size is added to D3D12VAEncodePicture. >> >> Signed-off-by: Tong Wu >> --- >> libavcodec/d3d12va_encode.c | 18 ++++++++++++------ >> libavcodec/d3d12va_encode.h | 1 + >> 2 files changed, 13 insertions(+), 6 deletions(-) >> >> diff --git a/libavcodec/d3d12va_encode.c b/libavcodec/d3d12va_encode.c index >> 9f7a42911e..9ee9da41e3 100644 >> --- a/libavcodec/d3d12va_encode.c >> +++ b/libavcodec/d3d12va_encode.c >> @@ -308,9 +308,9 @@ static int d3d12va_encode_issue(AVCodecContext *avctx, >> } >> >> pic->header_size = (int)bit_len / 8; >> - pic->header_size = pic->header_size % ctx- >>> req.CompressedBitstreamBufferAccessAlignment ? >> - FFALIGN(pic->header_size, ctx- >>> req.CompressedBitstreamBufferAccessAlignment) : >> - pic->header_size; >> + pic->aligned_header_size = pic->header_size % ctx- >>> req.CompressedBitstreamBufferAccessAlignment ? >> + FFALIGN(pic->header_size, ctx- >>> req.CompressedBitstreamBufferAccessAlignment) : >> + pic->header_size; >> >> hr = ID3D12Resource_Map(pic->output_buffer, 0, NULL, (void **)&ptr); >> if (FAILED(hr)) { >> @@ -318,7 +318,7 @@ static int d3d12va_encode_issue(AVCodecContext *avctx, >> goto fail; >> } >> >> - memcpy(ptr, data, pic->header_size); >> + memcpy(ptr, data, pic->aligned_header_size); >> ID3D12Resource_Unmap(pic->output_buffer, 0, NULL); >> } >> >> @@ -344,10 +344,10 @@ static int d3d12va_encode_issue(AVCodecContext >> *avctx, >> >> input_args.PictureControlDesc.PictureControlCodecData = pic->pic_ctl; >> input_args.PictureControlDesc.ReferenceFrames = d3d12_refs; >> - input_args.CurrentFrameBitstreamMetadataSize = pic->header_size; >> + input_args.CurrentFrameBitstreamMetadataSize = pic- >>> aligned_header_size; >> >> output_args.Bitstream.pBuffer = pic->output_buffer; >> - output_args.Bitstream.FrameStartOffset = pic->header_size; >> + output_args.Bitstream.FrameStartOffset = pic- >>> aligned_header_size; >> output_args.ReconstructedPicture.pReconstructedPicture = pic- >>> recon_surface->texture; >> output_args.ReconstructedPicture.ReconstructedPictureSubresource = 0; >> output_args.EncoderOutputMetadata.pBuffer = pic- >>> encoded_metadata; >> @@ -663,6 +663,12 @@ static int >> d3d12va_encode_get_coded_data(AVCodecContext *avctx, >> goto end; >> ptr = pkt->data; >> >> + memcpy(ptr, mapped_data, pic->header_size); >> + >> + ptr += pic->header_size; >> + mapped_data += pic->aligned_header_size; >> + total_size -= pic->header_size; >> + >> memcpy(ptr, mapped_data, total_size); >> >> ID3D12Resource_Unmap(pic->output_buffer, 0, NULL); diff --git >> a/libavcodec/d3d12va_encode.h b/libavcodec/d3d12va_encode.h index >> 1a0abc5bd0..51440428e4 100644 >> --- a/libavcodec/d3d12va_encode.h >> +++ b/libavcodec/d3d12va_encode.h >> @@ -43,6 +43,7 @@ typedef struct D3D12VAEncodePicture { >> FFHWBaseEncodePicture base; >> >> int header_size; >> + int aligned_header_size; >> >> AVD3D12VAFrame *input_surface; >> AVD3D12VAFrame *recon_surface; >> -- >> 2.45.1.windows.1 > > > The first patch in this patchset has been merged earlier. Will merge this patch if there's no more comment. > > -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". Somehow I missed that patch. You should've ping me when I pushed the first one. Pushed. In Vulkan, we expose the raw packet we've just encoded by wrapping it as an AVBufferRef, you should consider doing this. --------------CV8gdIPOAcs38dq59x2e4Weo Content-Type: application/pgp-keys; name="OpenPGP_0xA2FEA5F03F034464.asc" Content-Disposition: attachment; filename="OpenPGP_0xA2FEA5F03F034464.asc" Content-Description: OpenPGP public key Content-Transfer-Encoding: 7bit -----BEGIN PGP PUBLIC KEY BLOCK----- xjMEXnFG3BYJKwYBBAHaRw8BAQdA3FyJpqEdfQj4GA7OUWVrNheT9dUsIs+yUx6H ljr9mYvNFEx5bm5lIDxkZXZAbHlubmUuZWU+wpAEExYIADgWIQT+UBOcaAVyyv1S H42i/qXwPwNEZAUCXnFG3AIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRCi /qXwPwNEZOTWAQCSNEA+kZLINZ2dsR5Qg988c0HXpOXThZEjg+h1TL7KGgEA3Gff 0c28efI02S6iMxazrpdWGHqHk7JN7pCjnt397wzOOARecUbcEgorBgEEAZdVAQUB AQdAjDdFQ5H+AJ9vwXrOb7val460g45EsheIaL5S7/zSaX8DAQgHwngEGBYIACAW IQT+UBOcaAVyyv1SH42i/qXwPwNEZAUCXnFG3AIbDAAKCRCi/qXwPwNEZKaxAQCH LV4gAk/B9JvRG27MYm22X3+5QRCLBtEILP29aDh+MQD/V8JFHATDXRY30LsmqR3s PQ0BJ1UFVZA5BUoIJPJZWwg= =ylY5 -----END PGP PUBLIC KEY BLOCK----- --------------CV8gdIPOAcs38dq59x2e4Weo-- --------------bcXMwnQK3CihymOoSf70xEfb-- --------------Ul2rz1Rq2qbfVlfjNom5XXgY Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature.asc" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQT+UBOcaAVyyv1SH42i/qXwPwNEZAUCZqZp1wUDAAAAAAAKCRCi/qXwPwNEZNKr AP9BlQ40ma3TH5g4GbzfxFjvZj7yhjLoi3IHB0EHMddQagEA3lDQg3ZNoWcTMQeSfAkQWmU/YJjY ce2KXR4lz2Q9VQ4= =SsF0 -----END PGP SIGNATURE----- --------------Ul2rz1Rq2qbfVlfjNom5XXgY-- --===============8005532578764063802== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ 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". --===============8005532578764063802==--