From patchwork Tue Aug 23 09:56:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 37415 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1777053pzh; Tue, 23 Aug 2022 02:53:37 -0700 (PDT) X-Google-Smtp-Source: AA6agR4xdcMVbYFY6vtH6FiGyQA9/kO0gCEA1j4k9nq3I7OR09aLA8wGiwg33Rf4S6LtiLUrNYPJ X-Received: by 2002:a05:6402:254a:b0:446:d52a:6c8 with SMTP id l10-20020a056402254a00b00446d52a06c8mr2998860edb.107.1661248417491; Tue, 23 Aug 2022 02:53:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661248417; cv=none; d=google.com; s=arc-20160816; b=LU1L82757IpVovsdGWlhkWi56K5Aw/AXKQQUcIDP1QDDzNb6xKlgP82RU6GAMs1SWQ yMp50PTra8obyp6MElwibx6o6gHHZlNOybKE8rmCdnGSdQwKJEeGfHB275bkra4SjR93 eat8249nAehsLMhBzzFxuyMLRv10KAd/prI0JqdMiyZKH6MXziR14/C3is7CS6XrRKGy Hkh6TqZSZBIQ2dyKc6e+GFDkWhvIsKLKgjFOcF5cmu6DuyOl4koZMzmy+W6KSiSDTSCq qwK5eCxKWXG/fFCDKGeAuljZp6EdWVhUYqpMIhaddPr/D1mxf3zErXdOWmCuqpRv51bP NTLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to; bh=BYPgB6//4PAn0cO1YxU/c43rcbh300G8841dF/wv5wI=; b=pH5fGbgF4icoad6gO99ZMesWqstJaEdUeAcpS+RaolxYC5MnB/L38Ja/Bb1AL+W639 N2LI/UE5j2KURIQqR4/W6XWsjRR0+h/KFtXh0SJLST5WwfdoH+c+R3jV96Qhux/thgp6 5YrneGD5w3HudGoA36UzG5OTAg4UtYZ9iTBOfgumUtJyMpTfF1at0QIViVx368s0ELbG 6m/POToqEqds86YkZow2n+ghZGeEmOam+AJRR6ZqrKiEm6Zlz+WZqpvMcjGWHuNbCftm 7dSaaPBatDuyipymF1BZKbUUmaIMnC09lT+ojPMjCYFUlslC9l3tfiiGSZR5LFPn8Hdo FohA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=nmjYLXXU; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hu8-20020a170907a08800b0073d6b9d1deesi6442959ejc.434.2022.08.23.02.53.36; Tue, 23 Aug 2022 02:53:37 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=nmjYLXXU; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4E3C468B8DA; Tue, 23 Aug 2022 12:53:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yw1-f174.google.com (mail-yw1-f174.google.com [209.85.128.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 27BBC68B7C9 for ; Tue, 23 Aug 2022 12:53:27 +0300 (EEST) Received: by mail-yw1-f174.google.com with SMTP id 00721157ae682-3375488624aso335827457b3.3 for ; Tue, 23 Aug 2022 02:53:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:mime-version:from:to:cc; bh=VukaGaB4U56jdO1Md7DlXhLXt3BegEwyNx/IpGmQ9h0=; b=nmjYLXXUZsnZbLlI1heVjqvwG66W7nNM/ioDOn/ytbFCdGOWx2x/Ain7vpszjrSLSY UQjaXc4xq+R/eOn7ypDxmSVZNNR2rZ7NgZlug+y7PMfXS48lwlFAnJYWIA3+67MT2B4t /9ruZ43YmXW18HhSkl/jd03oT9prHcb/VhT2WQLCKYvi9gicnm4Re17LWwCmY/Zrs3Ox Y5jLVr6IaHJ5CLDYYLWnLCpxF8zPLP9ScrbQEgufoWZmsiCYyd1T1noOAYQoKAzOM1Jb iGcDlKS73is+W5c423L6YLAQFKVYn651ASxRXwi+JFBzdHnwuHd9cz1ygXODMA++igMZ KSag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc; bh=VukaGaB4U56jdO1Md7DlXhLXt3BegEwyNx/IpGmQ9h0=; b=DDWa47HmfLsadvngVyvtzW24/Kw4CRddbHlv8IZEG/mRCtfyNQ9Ue97/K6xVnLAXpm ZZhVwQBeo8ROFUth0cYSAWPu/i1BNcFnt7LqDLm0+nE234GYKo3vBdw4MC5v6xF52MyK z4Ip0ssmiA3EINT2lpLUXG0C+4i0gd/+8Pmy92ofUuNCpts2TOgFlTI7QkGmxfAxRQl9 PVFcKH6OG+UFMAb9aHGt9mpjQOGw6B99Y8ewLm9lt58YZOZzOjeMF4MeIL4IGPAC05rz h+NIuzbbONM4EGtIUtki+1rmFewQt+ZUzBIPbwQdDRAuEPXWSyVJaMKfQ55duyBZ4K0j DIXg== X-Gm-Message-State: ACgBeo1jg44PEx/gMhIFZDGrUi2YOElavQh52KJFN8fLHXobkcYYSuw3 zM5ucW4TPTuqrmKAo+saon5soLZ6fY13fHRegdQOaROm X-Received: by 2002:a25:198b:0:b0:690:65bb:9416 with SMTP id 133-20020a25198b000000b0069065bb9416mr22989171ybz.142.1661248405656; Tue, 23 Aug 2022 02:53:25 -0700 (PDT) MIME-Version: 1.0 From: Paul B Mahol Date: Tue, 23 Aug 2022 11:56:38 +0200 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH] avcodec/gif: fix duration of last packet/frame 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: lhjbvDD12fyw Hi, patch attached. From f126c6ef9e5fa8b51272508af6603f05c26a3f26 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Tue, 23 Aug 2022 11:51:24 +0200 Subject: [PATCH] avcodec/gif: fix duration of last packet/frame Fixes #6294 Signed-off-by: Paul B Mahol --- libavcodec/gif.c | 2 ++ libavformat/gif.c | 33 +++++++-------------------------- 2 files changed, 9 insertions(+), 26 deletions(-) diff --git a/libavcodec/gif.c b/libavcodec/gif.c index 8e84b79b8c..2484cc92e2 100644 --- a/libavcodec/gif.c +++ b/libavcodec/gif.c @@ -513,6 +513,8 @@ static int gif_encode_frame(AVCodecContext *avctx, AVPacket *pkt, return ret; } + pkt->duration = av_rescale_q(pict->duration, (AVRational){ 1, 100 }, + avctx->time_base); pkt->size = outbuf_ptr - pkt->data; if (s->image || !avctx->frame_number) pkt->flags |= AV_PKT_FLAG_KEY; diff --git a/libavformat/gif.c b/libavformat/gif.c index b52ff4dd39..afb5767541 100644 --- a/libavformat/gif.c +++ b/libavformat/gif.c @@ -36,7 +36,6 @@ typedef struct GIFContext { int duration; int64_t last_pos; int have_end; - AVPacket *prev_pkt; } GIFContext; static int gif_write_header(AVFormatContext *s) @@ -81,28 +80,20 @@ static int gif_parse_packet(AVFormatContext *s, const uint8_t *data, int size) return 0; } -static int gif_get_delay(GIFContext *gif, AVPacket *prev, AVPacket *new) +static int gif_get_delay(GIFContext *gif, AVPacket *pkt) { - if (new && new->pts != AV_NOPTS_VALUE) - gif->duration = av_clip_uint16(new->pts - prev->pts); - else if (!new && gif->last_delay >= 0) + if (pkt->duration != 0) + gif->duration = av_clip_uint16(pkt->duration); + else if (!pkt && gif->last_delay >= 0) gif->duration = gif->last_delay; return gif->duration; } -static int gif_write_packet(AVFormatContext *s, AVPacket *new_pkt) +static int gif_write_packet(AVFormatContext *s, AVPacket *pkt) { GIFContext *gif = s->priv_data; AVIOContext *pb = s->pb; - AVPacket *pkt = gif->prev_pkt; - - if (!gif->prev_pkt) { - gif->prev_pkt = av_packet_alloc(); - if (!gif->prev_pkt) - return AVERROR(ENOMEM); - return av_packet_ref(gif->prev_pkt, new_pkt); - } gif->last_pos = avio_tell(pb); if (pkt->size > 0) @@ -144,7 +135,7 @@ static int gif_write_packet(AVFormatContext *s, AVPacket *new_pkt) delay_pos = gif_parse_packet(s, pkt->data + off, pkt->size - off); if (delay_pos > 0 && delay_pos < pkt->size - off - 2) { avio_write(pb, pkt->data + off, delay_pos); - avio_wl16(pb, gif_get_delay(gif, pkt, new_pkt)); + avio_wl16(pb, gif_get_delay(gif, pkt)); avio_write(pb, pkt->data + off + delay_pos + 2, pkt->size - off - delay_pos - 2); } else { avio_write(pb, pkt->data + off, pkt->size - off); @@ -154,17 +145,13 @@ static int gif_write_packet(AVFormatContext *s, AVPacket *new_pkt) if (delay_pos > 0 && delay_pos < pkt->size - 2) { avio_write(pb, pkt->data, delay_pos); - avio_wl16(pb, gif_get_delay(gif, pkt, new_pkt)); + avio_wl16(pb, gif_get_delay(gif, pkt)); avio_write(pb, pkt->data + delay_pos + 2, pkt->size - delay_pos - 2); } else { avio_write(pb, pkt->data, pkt->size); } } - av_packet_unref(gif->prev_pkt); - if (new_pkt) - return av_packet_ref(gif->prev_pkt, new_pkt); - return 0; } @@ -173,14 +160,8 @@ static int gif_write_trailer(AVFormatContext *s) GIFContext *gif = s->priv_data; AVIOContext *pb = s->pb; - if (!gif->prev_pkt) - return AVERROR(EINVAL); - - gif_write_packet(s, NULL); - if (!gif->have_end) avio_w8(pb, GIF_TRAILER); - av_packet_free(&gif->prev_pkt); return 0; } -- 2.37.2