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 2A13B4DAF7 for ; Fri, 28 Feb 2025 09:34:06 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3C63068DC7A; Fri, 28 Feb 2025 11:34:02 +0200 (EET) Received: from out162-62-57-252.mail.qq.com (out162-62-57-252.mail.qq.com [162.62.57.252]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5858868DA59 for ; Fri, 28 Feb 2025 11:33:55 +0200 (EET) Received: from localhost.localdomain ([103.102.203.200]) by newxmesmtplogicsvrszb20-0.qq.com (NewEsmtp) with SMTP id 86C29E25; Fri, 28 Feb 2025 17:33:44 +0800 X-QQ-mid: xmsmtpt1740735224te1rqrijx Message-ID: X-QQ-XMAILINFO: OArVhh3PEoY8ed9Wwi3ZiQAXqzv7ln8Mc0jw0gqV4UA91+Az9uV2hxF+INGOMv MNUElUXdOSraihWg0uxW3yL5HWRkZWHtINzgNPHSj8vgAiRvDFD3j0m0Ev02u9WYH4EPXnTibtI4 GbEkzmM/rr6AUussZReSTC/3cyzF9VYhyZiewHXpChAaBR84bDg6sCb++Ev7PALRiEjxYPrpfAty dvVKAbydbnRweIRIC/EukD+hvEJagQfLE71JTQBO5KvL+/4fdmiJ+AX8Zx+5t4cDU4EazfpzKEyd AQtbfOktJHUs9M/uprrQ210XKdyBwUb2ene/8F9B0geJmAui4OPg6ijcq3U8JbyBhfPuvS1JM/I+ Z0n11FcXIQ233trC8Ss62glhkNTU2aXrQ3iwaboCTu1pgGpQPrRP3rlLgRY2FfSN21Ihpma0NGZv XkjrfbctsoKgrBqzWhqunV60VxQ9bmqNMNP+7Y3tZ43SpXbY1w0O5BpXOB+Ns8in8n5XkN3+Rf78 6smXmTTR7oR7RnXk7I4+zksfE9Zv4WWyL4Obq+ezdy4j1Uzp4/RsjSdLjN83GB3tS89lNviyz0pS tT1oJnWY7n/uhJwcxJVL5p9YbOVxb7IlKbPPfCHima3TBX1seXKo/ZQ4FbRMnzT/Eg71W90Y+Tbn fobSrc+AfgDBqF5DeWDiRf4J1R/87RiAo6549BQB6gEC+ngI/l102uY8/prlkBdvMJ+7KacqE9cg pngVWVYtO29FLmj3nPVTw+4Jfp1crBwisbaycKrdfomC0M9ITEs3mFUK4vMWxY8XF2jJMSHX5fUP v/smIfb0EtNyGgqln4+Ge8t5OZOh/RO17fDmmMMxgpjqSoDmSjgkEwCGDkPPSbWUg2Gy5aEVkIb7 Oj5r7ODeJxJDD/6VTt9lYPvuSSmg7czA== X-QQ-XMRINFO: MSVp+SPm3vtS1Vd6Y4Mggwc= To: ffmpeg-devel@ffmpeg.org Date: Fri, 28 Feb 2025 17:33:41 +0800 X-OQ-MSGID: <20250228093341.28279-1-1035567130@qq.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/libwebpenc_anim: support setting the duration of the last 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: , From: wangyaqiang via ffmpeg-devel Reply-To: FFmpeg development discussions and patches Cc: 1035567130@qq.com, Wang Yaqiang 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: From: Wang Yaqiang Signed-off-by: Wang Yaqiang --- libavcodec/libwebpenc_animencoder.c | 18 ++++++++++++++++-- libavcodec/libwebpenc_common.c | 2 ++ libavcodec/libwebpenc_common.h | 1 + 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/libavcodec/libwebpenc_animencoder.c b/libavcodec/libwebpenc_animencoder.c index c5361d7f92..dbf1bd946d 100644 --- a/libavcodec/libwebpenc_animencoder.c +++ b/libavcodec/libwebpenc_animencoder.c @@ -38,6 +38,7 @@ typedef struct LibWebPAnimContext { WebPAnimEncoder *enc; // the main AnimEncoder object int64_t first_frame_pts; // pts of the first encoded frame. int64_t end_pts; // pts + duration of the last frame + int64_t prev_frame_pts; // pts of the previously encoded frame. void *first_frame_opaque; AVBufferRef *first_frame_opaque_ref; @@ -72,7 +73,19 @@ static int libwebp_anim_encode_frame(AVCodecContext *avctx, AVPacket *pkt, if (s->done) { // Second flush: return empty package to denote finish. *got_packet = 0; return 0; - } else { // First flush: assemble bitstream and return it. + } else { + if (s->cc.last_delay > 0) { + int timestamp_ms = avctx->time_base.num * (s->cc.last_delay + s->prev_frame_pts) * 1000 / avctx->time_base.den; + ret = WebPAnimEncoderAdd(s->enc, NULL, timestamp_ms, &s->cc.config); + if (!ret) { + av_log(avctx, AV_LOG_ERROR, + "Encoding WebP frame failed!\n"); + ret = AVERROR_EXTERNAL; + goto end; + } + s->end_pts = s->prev_frame_pts + s->cc.last_delay; + } + // First flush: assemble bitstream and return it. WebPData assembled_data = { 0 }; ret = WebPAnimEncoderAssemble(s->enc, &assembled_data); if (ret) { @@ -137,7 +150,8 @@ static int libwebp_anim_encode_frame(AVCodecContext *avctx, AVPacket *pkt, if (frame->pts != AV_NOPTS_VALUE) s->end_pts = frame->pts + frame->duration; - + s->prev_frame_pts = frame->pts; ret = 0; *got_packet = 0; diff --git a/libavcodec/libwebpenc_common.c b/libavcodec/libwebpenc_common.c index 80040ea9e3..13fb6aa690 100644 --- a/libavcodec/libwebpenc_common.c +++ b/libavcodec/libwebpenc_common.c @@ -49,6 +49,8 @@ static const AVOption options[] = { { "cr_threshold","Conditional replenishment threshold", OFFSET(cr_threshold), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE }, { "cr_size" ,"Conditional replenishment block size", OFFSET(cr_size) , AV_OPT_TYPE_INT, { .i64 = 16 }, 0, 256, VE }, { "quality" ,"Quality", OFFSET(quality), AV_OPT_TYPE_FLOAT, { .dbl = 75 }, 0, 100, VE }, + { "final_delay", "Force delay (in centiseconds) after the last frame", OFFSET(last_delay), + AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, VE }, { NULL }, }; diff --git a/libavcodec/libwebpenc_common.h b/libavcodec/libwebpenc_common.h index 2735ccc88d..8e5f37805a 100644 --- a/libavcodec/libwebpenc_common.h +++ b/libavcodec/libwebpenc_common.h @@ -47,6 +47,7 @@ typedef struct LibWebPContextCommon { AVFrame *ref; int cr_size; int cr_threshold; + int last_delay; } LibWebPContextCommon; int ff_libwebp_error_to_averror(int err); -- 2.39.3 (Apple Git-146) _______________________________________________ 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".