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 ESMTPS id 4AC394C7F1 for ; Mon, 10 Mar 2025 17:42:49 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EC07068E1BC; Mon, 10 Mar 2025 19:42:46 +0200 (EET) Received: from vidala.pars.ee (vidala.pars.ee [116.203.72.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 143F768E1BC for ; Mon, 10 Mar 2025 19:42:40 +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=1741628559; bh=7oOZ21qVquS7AA7KWWsztA+ uHza/QIQQ2FEcIUg7QbI=; b=Y5wTZo/xLq8ZcJ9mLvXn3Tmd/48rNCkO5LknisZskHSF+3CqIZ qmTIaCMNs8bsqZ588CqlNO8tz5b4iVr/PZuP9H/CaWu5Y5mLggUsLb5GzXS3RbX9S6cYV1lJKtU Uma8+3s/HuZfVSj+RnojqeWcMqV7mVambVTq375F0tPf02YLEihENN1nlUeeVDKYhYP00ynldvd jWB3LRH4xH9BUow1PiPQu9MFmdEpHRSMb8X3e/xTzfUXJEEGjkBvr7PcfUsdqkcozHv+81Tg0Dl fqmgodMCgF2QCvh2gRVmtYhvNdQQwHvtmdOWoCkl7sECgssd2ShIiJWb7ohDzJZxrWA==; DKIM-Signature: v=1; a=ed25519-sha256; s=202405e; d=lynne.ee; c=relaxed/relaxed; h=From:To:Subject:Date:Message-ID; t=1741628559; bh=7oOZ21qVquS7AA7KWWsztA+ uHza/QIQQ2FEcIUg7QbI=; b=ItbUXWM/HF1NYLG+++Yf7R+yk37i1Z6b91Ii423gS2Kle7d6za IPVOWD5ECN+JX6CU5t0n7C/Whu4yY303/UCA==; Message-ID: Date: Mon, 10 Mar 2025 18:42:39 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Beta To: ffmpeg-devel@ffmpeg.org References: <20250310030837.60814-1-dev@lynne.ee> <20250310030912.60902-1-dev@lynne.ee> Content-Language: en-US From: Lynne 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 11/13] ffv1dec: reference the current packet into the main context 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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 10/03/2025 04:14, Andreas Rheinhardt wrote: > Lynne: >> --- >> libavcodec/ffv1.h | 3 +++ >> libavcodec/ffv1dec.c | 19 +++++++++++++++++-- >> 2 files changed, 20 insertions(+), 2 deletions(-) >> >> diff --git a/libavcodec/ffv1.h b/libavcodec/ffv1.h >> index 8c0e71284d..860a5c14b1 100644 >> --- a/libavcodec/ffv1.h >> +++ b/libavcodec/ffv1.h >> @@ -174,6 +174,9 @@ typedef struct FFV1Context { >> * NOT shared between frame threads. >> */ >> uint8_t frame_damaged; >> + >> + /* Reference to the current packet */ >> + AVPacket *pkt_ref; >> } FFV1Context; >> >> int ff_ffv1_common_init(AVCodecContext *avctx, FFV1Context *s); >> diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c >> index eaa21eebdf..6396f22f79 100644 >> --- a/libavcodec/ffv1dec.c >> +++ b/libavcodec/ffv1dec.c >> @@ -469,6 +469,10 @@ static av_cold int decode_init(AVCodecContext *avctx) >> f->pix_fmt = AV_PIX_FMT_NONE; >> f->configured_pix_fmt = AV_PIX_FMT_NONE; >> >> + f->pkt_ref = av_packet_alloc(); >> + if (!f->pkt_ref) >> + return AVERROR(ENOMEM); >> + >> if ((ret = ff_ffv1_common_init(avctx, f)) < 0) >> return ret; >> >> @@ -701,6 +705,10 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *rframe, >> >> /* Start */ >> if (hwaccel) { >> + ret = av_packet_ref(f->pkt_ref, avpkt); >> + if (ret < 0) >> + return ret; >> + >> ret = hwaccel->start_frame(avctx, avpkt->data, avpkt->size); >> if (ret < 0) >> return ret; >> @@ -720,15 +728,21 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *rframe, >> uint32_t len; >> ret = find_next_slice(avctx, avpkt->data, buf_end, i, >> &pos, &len); >> - if (ret < 0) >> + if (ret < 0) { >> + av_packet_unref(f->pkt_ref); >> return ret; >> + } >> >> buf_end -= len; >> >> ret = hwaccel->decode_slice(avctx, pos, len); >> - if (ret < 0) >> + if (ret < 0) { >> + av_packet_unref(f->pkt_ref); >> return ret; >> + } >> } >> + >> + av_packet_unref(f->pkt_ref); >> } else { >> ret = decode_slices(avctx, c, avpkt); >> if (ret < 0) >> @@ -827,6 +841,7 @@ static av_cold int ffv1_decode_close(AVCodecContext *avctx) >> ff_progress_frame_unref(&s->last_picture); >> av_refstruct_unref(&s->hwaccel_last_picture_private); >> >> + av_packet_free(&s->pkt_ref); >> ff_ffv1_close(s); >> >> return 0; > > Why not simply use a const AVPacket*? No reason. Fixed locally. Thanks. _______________________________________________ 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".