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 E682343F9B for ; Tue, 23 Aug 2022 12:56:05 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E33B868B99A; Tue, 23 Aug 2022 15:56:04 +0300 (EEST) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067085.outbound.protection.outlook.com [40.92.67.85]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 44E1968B926 for ; Tue, 23 Aug 2022 15:56:03 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C1xlskfX7hMcRgSXTLBDKM0z6oX7qew6yqqA5hGVjcTLc2ZfW8jY76bT1nZNjsqWI+owN3P3y3S6znAme9obY051ErhsnAdmq7FMlt/a2UN/ZWNG0eyF1Qphi94S1fQzEgJoq65w9y2/oq2u83HPcFu0ao7O3sZjBXzxwsaoYyIGF6SOovXdux4uW7D3hG39x3myEv2DWu9wnCIEPLcZ3oCrOch01tWyzxulQ2I2NUksBFoV7w5RP/uzkhAUHOHQJTwi+99Sjk2nElf8rOcJkeIbbZWGY7qGLFwJJL7XIdRUBxAxr+fwkgcvm5QBG5wOaRGuL2Quu/uW66RE/dXbhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=k9pABCRte6N/k5u62ulc4nTUPux2FRJGaHulUXmxjx0=; b=WKKuw08aDw4YdNeTGICklteKSlmFVRVgeQzPdG3kQLYNf8xruy5I2t990WrKcRmnclj0Zneqy2EzCP+wuRw+gurdF6/6IEleyPhd6eXEdylxC2cXTd0YvPOQPXrzNi/JzSKCcMz79vyimcpfQYKI73DOM9vKFQRQrXOusXSXdaWN1+EBJrCA3c4la29HtVnMXMhBSzbKMVPXfgPQHba6nVjcoJVbv1Ombnlk+oY5E5OnneWM25QhWKUupYCkZa9/Q6oFCT9o8mYthBSLmDU8YdR3J5Sg5+XqdrAZ5ZGt5ODe9Z26GMUUuJJANMqoDhQMK8zH0i6DBY95tXfdaY90fg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=k9pABCRte6N/k5u62ulc4nTUPux2FRJGaHulUXmxjx0=; b=e9fUrwfbyKvcz0G21THDNd3pQhcVNxKW77omZ9QfZ4zjp6n7RYvqqu4TVuN4fkz94mxvjeUwHHC8DtQ83QLGDJoY/OJZighc59rPcelBBzm7w3z11CnV/WhcDKGUQRLlJmiVHtfu1YteZivdglqxlVsddNzljDPauPYdCrwqFgH6G7nIx5tWwpq1v3K4OKd+PUDyIWDCFhXDCm1UMZrGsc7eYds1CeYm6CQHefvMSiT/azoj3Ze4XaWnZrDxUS054qplbyvNOsvBPqgmfeo6wPkcqJiwYpPCRO18WnWaj5ENfUvrYuf2CzZbt4PCXTXYSWibDetnWZfmlEsh8+WWhA== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by HE1PR0101MB2346.eurprd01.prod.exchangelabs.com (2603:10a6:3:89::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.14; Tue, 23 Aug 2022 12:56:02 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5546.022; Tue, 23 Aug 2022 12:56:02 +0000 Message-ID: Date: Tue, 23 Aug 2022 14:56:00 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [Csn9HlAVM6zP3l1SAR8EVjsE1mD09Fu2] X-ClientProxiedBy: ZR0P278CA0062.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:21::13) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <8927ef03-63b0-1eed-2b6d-5c7592de3084@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b03f4c49-362e-437e-847f-08da8506d538 X-MS-TrafficTypeDiagnostic: HE1PR0101MB2346:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pnJcCVcS4nMvixHORVcU4zxDTe6kQtO3oRVCwukf8DElRH0FRwYoM+fO2182z3L5sEeBjfZ0bIf1syp0b/xxoIzI82ENSDzXHkWNiz01OvBWEj4cYRcPvHoXrTQo4j5v2Cauk59bnfYXDEx0OCFeubh4804+lDZk206eKxvnoDBE3tE/DfYUbdFDOxC+8FjcpCQAIEzmBCDLmzuXiFqjNpp12w4wGlxIt6OMYRjbV1Uj+czvIHTG9RbbXsIsPnSQNvwirtEo76E0ft/doWo4h/GGsGE63FXSlmwzTk4zeMwnedHcohSPtOu93eptRaqt+c4qPe5boyT6tijK8dYtPpn7JydNRJbS25vprFsekJEu6n3a0Q6SL5h75JArfPW8bX26wQa+CVUxV5fmBmpJeQ3U62b/eoMHYKqadt/scqitLcYzvUs8L16QFvfoTrGWpH6RlyUKdpNefrPv7/mysD8IHKEfThbSoShW8uIcwY+O9pXZ7Nra9VWdymujIbAspH/QObVHqnT0KRBZpq3DHVDDQ6p+z8ieQ7OjWHdktaQUF2W1BcmCoqbJRdQXo8UbyQ1NGxXnaZHZxFlhVto178MOIEJPJPISVNVQw/5DMVJrel9I82b9Gf07gmmEYwZEDBmZkFMTgVvDg4Thiao49Fe786NAPW4/2iNoMcF3MGtyuxYchFiKaSVHHFki2Z4A X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?SHZ4ZVlBTDFObEV4bjFBQlFCKysrWkRGZ0k3dUdGemZxaTA0K29EQW4xdjZZ?= =?utf-8?B?RXZrNDFJRVlOQzRwMFdlV2FaZDFpVU5nK3UxN1o0RTZMZC9OL0V3NmFZUWdP?= =?utf-8?B?cmd0YTdjV3oyeXIrV1c2WU1ERlhqR2c2Q0FYVEFNUi9WWHJaMFVrU295Q050?= =?utf-8?B?T09nSXUrU0hLa3N5NTBiM2Q5VzVFUm1xaVd3cmowZmhzc1VFNXhYV1pESkpW?= =?utf-8?B?NkdHdGlzMmtWeU1GdElodEdDTUx5dm1YcHVqSVc3bmplYkFlTjRQcmN6MnZS?= =?utf-8?B?Z3hCYnJzWjg1M0ZiZGRhK0gzelg5U01MN2hDNkxnTnVrRzlzM0pJMWdaSktv?= =?utf-8?B?ZjBBNkFFSkkyL1BXYWlhRkpnbG1MWnlNY05lWm53QWwxUmVmdUlLc3VjTTJj?= =?utf-8?B?UHI4S3doTG9nRy9jczdISHhSaHhCZXVqUzBZbmZ1Q3Rodk1MRjlhb2NXVHVP?= =?utf-8?B?MXdnQ09LSFJkdnFVb0dqd2k0ZUV1ZEJKK2VubzNaTVJ6M2c0enpoWjI2NnBa?= =?utf-8?B?dGtheDZpdnFQMWhuckRqZktmS1d6b1EzZDhwUWhKVHcxY1hyRkFMd05jbDJH?= =?utf-8?B?dnEvVkdkYmVTRXlzSWdYVGluR1NOdm0zb0t6VDdhQzFLaTEyaWJadnY1QnNF?= =?utf-8?B?MUNuMnRLVGNIaStTUUtLVVhUS2xoNnhZTlpXU1hqZ25RWWphQ0Nod05qay9v?= =?utf-8?B?SHduTEZuMlVwQ0VwMDFpVWdxSGdiMStYd1AzR1RCaXQ2WjJFbFdwSDFjWjJO?= =?utf-8?B?WGNJNXdMdjQveStvZU1XWUNtZEZkeUtWb0JTVUdWSUswUG5hL084M2ZyTjAr?= =?utf-8?B?RjYrSm5ibkpFeThINjZqNTE1RjdCN3pIa2EzL3luYm1xMWV3b1AzRitCRUlQ?= =?utf-8?B?Q2xSSlAxMU9rb1VySC9LYlc4NHFQdGFHM21QWG1PZUlaeDBQYkUzNm4wUGFm?= =?utf-8?B?eW00MkRYRzlHY1dTY3NzaThsa3l6WlhDbk9KemxXQ0ZFZU1rREJ1aGx4NHRh?= =?utf-8?B?aTgyNHZMd0ZnQlZZZ2dHY2dBVnNFcjkxNkt2VWhtWXJPaXdyOU85S3NTVWlU?= =?utf-8?B?ZWpHYmVSSFBsV2E4bXZTL21RSzR5eG9kUjBXOWl2TWhmaDNzVVlqNEtGTkZS?= =?utf-8?B?QnVhNnhlY3FqQTJXRlZ2TDNBNHkrU3ZiMldIRDBqU2c0ODNnOGFyQzhnMkN2?= =?utf-8?B?TTZTVTc2MDIzRXBSOWw3SklIeGQxNGlJdmorbjgrS1dkMWRCcnVoMHFZZ1Mw?= =?utf-8?B?TGc5dnorZFJ5UHRKZGJnOE9PREJGdTFoY2JEcmdPNjlMdy9xOGRwMDNVQ3d5?= =?utf-8?B?WkZYS053eVROMk5LSWVDMXRrZGNpdVhoSE05WUEvdkUzbThoc1dQUDZsamRk?= =?utf-8?B?OUtuWFRDelFxTm0wUHRRczA3SGZpZnpUSWdLWGV1dHRJYVlzTVdPbnJXNmg3?= =?utf-8?B?elA2TUdpbkF3TThNZ1orYkptVXg2ZUlxZzZlUFpuWnFOZm9INDBNdENhL2Ey?= =?utf-8?B?a3lJTWd5TnllZmJJTmxnb0hJV1hzZTBGV1lkRXpnQXNUVGRjanBjR2EwQ2h0?= =?utf-8?B?TEtjTjlzTndrUDdIOENTSUNSNC85ZjZSNytMc2J1VE1ZUE50bTZaVlNhbG5q?= =?utf-8?B?aFZOL3EramsrZXBaNE1janJvZDFuaGppYVFNc3lLMFZtb0RvU1NBR3lwZ01X?= =?utf-8?B?OHV2MkxZVk5KMEVpcGl1STNsSGZ6UE94Vjg0SzNac0xSMEtiMkc4eDJjT0ZS?= =?utf-8?Q?f5PVea/TRTmKkLymmM=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b03f4c49-362e-437e-847f-08da8506d538 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2022 12:56:02.2551 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0101MB2346 Subject: Re: [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 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: Paul B Mahol: > 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) pkt is always non-NULL here. Muxers that don't have the AVFMT_ALLOW_FLUSH flag set never get NULL packets. Adding said flag would require more changes in this muxer (it would actually need to handle the case in which pkt is NULL). Anyway, this patch as-is breaks muxing for people who don't set pkt->duration, but rely on the final_delay option. Anyway, you can modify gif_get_delay() to take AVPacket.duration into account if it is set. As soon as we manage to properly set AVPacket.duration in avcodec/the fftools, we can deprecate the final_delay option. > 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; > } _______________________________________________ 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".