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 DA4184E205 for ; Mon, 10 Mar 2025 03:11:07 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EF6A268E83D; Mon, 10 Mar 2025 05:09:15 +0200 (EET) Received: from vidala.pars.ee (vidala.pars.ee [116.203.72.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ECD7968E821 for ; Mon, 10 Mar 2025 05:09:14 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; s=202405r; d=lynne.ee; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1741576154; bh=tTjvAz//5OvlBMiKoVrZeSG MKr2RK+71sqsvLn2H+j4=; b=B+UnDvPsDAVkm7Wz81xns53aBCw8UVw4DONG8lrW86BnthfRu9 5mXINjuGjhm7VQLCNqB3xHxhjzfTzme4NvyKn/G9aM70Ug/v/7pQx9ocriCQvc2+zWw/ZTBaSjb 9oFw+FwJI6Yo7zj0wfuWUNp0IYwmN3O4WP+IsRtHGbVmejd76mtTkjO5uysJQoZFDxl9Cn7A3CU qPANrj0/rCObCH3vfim06rCZErGuHCvBypGvics8qzfRqHDXPzQLu8gdGV3f8UsZCj40sTqNU5S DQxWn+OktgXJ1jmaFH5HENiWU37WOfn6XApM4pKJLXwjrLxBq47fh+oLeoqCaKTvGiA==; DKIM-Signature: v=1; a=ed25519-sha256; s=202405e; d=lynne.ee; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1741576154; bh=tTjvAz//5OvlBMiKoVrZeSG MKr2RK+71sqsvLn2H+j4=; b=7JVAjvnjNtTOIi2nCtqAI9JcY12x8iZaOWKrqPoXMXvkCG7GNW ksrtILTHB26P4CzVgDx/BFMQ5cybBYrdITDw==; From: Lynne To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Mar 2025 04:08:57 +0100 Message-ID: <20250310030912.60902-1-dev@lynne.ee> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250310030837.60814-1-dev@lynne.ee> References: <20250310030837.60814-1-dev@lynne.ee> MIME-Version: 1.0 Subject: [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 Cc: Lynne 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: --- 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; -- 2.47.2 _______________________________________________ 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".