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 389E94DAE7 for ; Fri, 28 Feb 2025 09:47:07 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2A0D068DCB7; Fri, 28 Feb 2025 11:47:03 +0200 (EET) Received: from out203-205-221-245.mail.qq.com (out203-205-221-245.mail.qq.com [203.205.221.245]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 56C3368D766 for ; Fri, 28 Feb 2025 11:46:56 +0200 (EET) Received: from localhost.localdomain ([103.102.203.200]) by newxmesmtplogicsvrszgpua8-1.qq.com (NewEsmtp) with SMTP id B540FEFB; Fri, 28 Feb 2025 17:45:20 +0800 X-QQ-mid: xmsmtpt1740735920txeko1idk Message-ID: X-QQ-XMAILINFO: NC4p7XQIBeahBqiPOgOgr8HPCO+I9pJ8YvJjeP95C3LWrDY/HD/fOtnAwLYN1g nUcwmnQmLbYZQkOrkfVDXFHLKg7a6Uh1dtdpoE0bF2hMuxxy8Y/RqLKTeBliaQ2HYvni3+5NeQc7 EH0Mw6uU87AAurlKE0LIBi9X8wqVwiuYvZcXNO8/9NZXmRaWszIZUXz0rfaEjaSa6IQLi4jxc2OW v5Pld9SNu7BLPLcfkNjBaWn/wQAQChzNw4ObLDn9rSMcAPxEeAzeQqv5nIbZzfgteXix8TDaYhd9 h16X2lNIUn2OF9xJUJQuUdm3M9iN5H44NGnKd4+ZhgOhXo4qz7/FsuHg/FDggbD14xCLVoNMO1Lb GT0aitR3/uqAEEwHxBtexlr2cOOIEXWbrBR58q9H/pHfLP6XFUGfKCTHJdpmrP5oHYribJ107yxR HnJce17A5xAgNqZHcud1KRU4tou4UkyE0EBnglg9M53ChIv1elf5Z6zys8I6+aJrmdjNJfjhxYE4 bUkXWbD933jMUquMAiCbe8/lfuuST0uY5VsgTtpD2gDsfDkNl9eU/8QRQzMzKyXPN+lasubGKT2z T6ggyF/VsxltyGqycSltQ7TjN/oy5hhbFKbp3mZgiPMY4PCT7S4gkAMK7wVV3M/OwZ+AeQUp7dYo XN+Rj0D76NkLjks6YHiveZM6Yds8D9YHWhC7W0bfEDPmXYHqgKLm8xvDfZnrFDf75ixScfNCjR7B HUljSE1RCfziO2SNimK5DrbiUuPmyH04Q7t510a0P/3cg6GE6aAiAN6QK5tVdryvnGfUzhn1/lwu l4Ni7LjslukTQ0KCEmqi4ZMEDthRM7prTYJsXk31qQRrN/iU3PyASYpE1cZn+nn3Xgyc6eT4FBFj u3edjrUnqs4rc8w6QK39Zqnf0pShjPCX7w+UieckoHwpt5XYJSEqinjeLbXem2OPJg4bK0OacC50 EbEFVnNpujhNmuCj1rCF9/VtN7JFXk X-QQ-XMRINFO: OWPUhxQsoeAVDbp3OJHYyFg= To: ffmpeg-devel@ffmpeg.org Date: Fri, 28 Feb 2025 17:45:18 +0800 X-OQ-MSGID: <20250228094518.33989-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 | 17 +++++++++++++++-- libavcodec/libwebpenc_common.c | 2 ++ libavcodec/libwebpenc_common.h | 1 + 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/libavcodec/libwebpenc_animencoder.c b/libavcodec/libwebpenc_animencoder.c index c5361d7f92..558fcc246d 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,7 @@ 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".