From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTPS id 7AD064CB86
for <ffmpegdev@gitmailbox.com>; Thu, 13 Mar 2025 23:03:47 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A0C7868CD6E;
Fri, 14 Mar 2025 01:03:43 +0200 (EET)
Received: from vidala.pars.ee (vidala.pars.ee [116.203.72.101])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 706C568CD6E
for <ffmpeg-devel@ffmpeg.org>; Fri, 14 Mar 2025 01:03:37 +0200 (EET)
DKIM-Signature: v=1; a=rsa-sha256; s=202405r; d=lynne.ee; c=relaxed/relaxed;
h=From:To:Subject:Date:Message-ID; t=1741907016; bh=gQgy9zwot9iAub0ercf3vxt
OsuA0qbgZm2nc5m+Lmcg=; b=AUp4bzkzNo2DItSp7UlXkEnKmdzVfWLMzTDRPDnrN869nccZFs
rOEgO3RnboZF9mYZiPOetLzj158H+zDaUYW+tqYTYbDQlOnKLrJCdU5nT5CJoIUNogFpX9D4bz+
zKJPy/0rHSrt9hEkhP4BxekKaNbcD5vsyXuv2x+HcyWy65p+AKtpKOr9FSFdiZ1LPIYLfYQXKyW
68fKNZKrx7IPs9fW9JOZ8Cd0N5Dt+JQgTxA1Nq1Y99Ct7feeqhuk28EWfX7FGqTx19byI8zJFwc
YNu1Mb5+a/r6JeYjS9mLniFHQVGGyJbhdwbBtSWW7FphCehm7gCVocFLmaNBQWO4bjw==;
DKIM-Signature: v=1; a=ed25519-sha256; s=202405e; d=lynne.ee; c=relaxed/relaxed;
h=From:To:Subject:Date:Message-ID; t=1741907016; bh=gQgy9zwot9iAub0ercf3vxt
OsuA0qbgZm2nc5m+Lmcg=; b=oDTcqTsCPh2flCS0PjNcDpK+/M92TfHEHdpRRKLcdpG7kqjir4
u277oRbrYw1IipRsb8gcfzbWK7St3ke39VCA==;
Message-ID: <444b61c3-18c4-4653-86a9-0a113edfac50@lynne.ee>
Date: Fri, 14 Mar 2025 00:03:36 +0100
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird Beta
To: ffmpeg-devel@ffmpeg.org
References: <20250313170355.92290-1-dev@lynne.ee>
<20250313170355.92290-16-dev@lynne.ee>
<AS8P250MB074433BA3F1574B364006D978FD32@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM>
Content-Language: en-US
From: Lynne <dev@lynne.ee>
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: <AS8P250MB074433BA3F1574B364006D978FD32@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM>
Subject: Re: [FFmpeg-devel] [PATCH v4 15/16] FFHWAccel: add buffer_ref
argument to start_frame
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="us-ascii"; Format="flowed"
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/444b61c3-18c4-4653-86a9-0a113edfac50@lynne.ee/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
On 13/03/2025 23:08, Andreas Rheinhardt wrote:
> Lynne:
>> This commit adds a reference to the buffer as an argument to
>> start_frame, and adapts all existing code.
>>
>> This allows for asynchronous hardware accelerators to skip
>> copying packet data by referencing it.
>> ---
>>
>> diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c
>> index da8fdc5935..20ef821819 100644
>> --- a/libavcodec/hevc/hevcdec.c
>> +++ b/libavcodec/hevc/hevcdec.c
>> @@ -3401,7 +3401,10 @@ static int hevc_frame_start(HEVCContext *s, HEVCLayerContext *l,
>> goto fail;
>>
>> if (s->avctx->hwaccel) {
>> - ret = FF_HW_CALL(s->avctx, start_frame, NULL, 0);
>> + AVCodecInternal *avci = s->avctx->internal;
>> + AVPacket *avpkt = avci->in_pkt;
>> + ret = FF_HW_CALL(s->avctx, start_frame,
>> + avpkt->buf, NULL, 0);
>> if (ret < 0)
>> goto fail;
>> }
>> diff --git a/libavcodec/hwaccel_internal.h b/libavcodec/hwaccel_internal.h
>> index 77df4e0904..4eb74f0b34 100644
>> --- a/libavcodec/hwaccel_internal.h
>> +++ b/libavcodec/hwaccel_internal.h
>> @@ -52,11 +52,13 @@ typedef struct FFHWAccel {
>> * Otherwise, this means the whole frame is available at this point.
>> *
>> * @param avctx the codec context
>> + * @param buf_ref the frame data buffer reference (optional)
>> * @param buf the frame data buffer base
>> * @param buf_size the size of the frame in bytes
>> * @return zero if successful, a negative value otherwise
>> */
>> - int (*start_frame)(AVCodecContext *avctx, const uint8_t *buf, uint32_t buf_size);
>> + int (*start_frame)(AVCodecContext *avctx, AVBufferRef *buf_ref,
>
> const AVBufferRef*, we are not passing ownership
Done locally.
> Why did you not make this the last parameter (given that only very few
> hwaccels will access it)?
It made more sense to have it upfront as it backs up the data given.
I can change it, but I'd rather not, unless you have a strong opinion.
>> + const uint8_t *buf, uint32_t buf_size);
>>
>> /**
>> * Callback for parameter data (SPS/PPS/VPS etc).
>> diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
>> index bd1b502e50..f3d940671e 100644
>> --- a/libavcodec/mjpegdec.c
>> +++ b/libavcodec/mjpegdec.c
>> @@ -808,7 +808,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
>> if (!s->hwaccel_picture_private)
>> return AVERROR(ENOMEM);
>>
>> - ret = hwaccel->start_frame(s->avctx, s->raw_image_buffer,
>> + ret = hwaccel->start_frame(s->avctx, NULL, s->raw_image_buffer,
>> s->raw_image_buffer_size);
>> if (ret < 0)
>> return ret;
>> diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
>> index ffe0710470..c21f220680 100644
>> --- a/libavcodec/mpeg12dec.c
>> +++ b/libavcodec/mpeg12dec.c
>> @@ -1361,7 +1361,7 @@ static int mpeg_field_start(Mpeg1Context *s1, const uint8_t *buf, int buf_size)
>> }
>>
>> if (avctx->hwaccel) {
>> - if ((ret = FF_HW_CALL(avctx, start_frame, buf, buf_size)) < 0)
>> + if ((ret = FF_HW_CALL(avctx, start_frame, NULL, buf, buf_size)) < 0)
>> return ret;
>> } else if (s->codec_tag == MKTAG('V', 'C', 'R', '2')) {
>> // Exchange UV
>> diff --git a/libavcodec/nvdec_av1.c b/libavcodec/nvdec_av1.c
>> index 6b408edb87..9b9be702d5 100644
>> --- a/libavcodec/nvdec_vp9.c
>> +++ b/libavcodec/nvdec_vp9.c
>> @@ -29,7 +29,8 @@
>> #include "internal.h"
>> #include "vp9shared.h"
>>
>> -static int nvdec_vp9_start_frame(AVCodecContext *avctx, const uint8_t *buffer, uint32_t size)
>> +static int nvdec_vp9_start_frame(AVCodecContext *avctx, AVBufferRef *buffer_ref,
>> + const uint8_t *buffer, uint32_t size)
>> {
>> VP9SharedContext *h = avctx->priv_data;
>> const AVPixFmtDescriptor *pixdesc = av_pix_fmt_desc_get(avctx->sw_pix_fmt);
>> diff --git a/libavcodec/proresdec.c b/libavcodec/proresdec.c
>> index 01caa611a0..edc46e1442 100644
>> --- a/libavcodec/proresdec.c
>> +++ b/libavcodec/proresdec.c
>> @@ -793,7 +793,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
>>
>> if (HWACCEL_MAX && avctx->hwaccel) {
>> const FFHWAccel *hwaccel = ffhwaccel(avctx->hwaccel);
>> - ret = hwaccel->start_frame(avctx, NULL, 0);
>> + ret = hwaccel->start_frame(avctx, avpkt->buf, NULL, 0);
>
> Passing an AVBufferRef for NULL data seems fishy.
I misinterpreted what NULL means.
Changed this to be NULL.
_______________________________________________
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".