From patchwork Tue Mar 17 10:55:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 18260 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id D1F7144B679 for ; Tue, 17 Mar 2020 12:55:31 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B1B2568B5E1; Tue, 17 Mar 2020 12:55:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 49D1768B5CB for ; Tue, 17 Mar 2020 12:55:25 +0200 (EET) Received: by mail-pg1-f194.google.com with SMTP id y30so11511892pga.13 for ; Tue, 17 Mar 2020 03:55:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=KZVdx7x3iFUR2DUNEnTxY2scn/6HZfJOJuojLhgglFc=; b=fMXQaN8GwIEc0HiZpQzLqZXMNxICOlMjd/IODSK2+goP3U5fe3kNK+vIWeaoEwO6Oh DRkuNYzghbibkhuvXds4HrZwhdel303Wt1j3r6segUfW0JpWFMiuIaCOgkca72WbvlNg pJ/RlHQbr9WaoP++wNozcCIkZ1AfF1ZmLg1DOOcPLZw7dtzttrXOmZZgZjPEfKgyVMbQ huZ0xywta/qh8hlA5zldIS+lONet9o3ze5Xc8x0qVNLvEuUgtYGfUj07IRAqd3+YslnI NgKZ3jO8+MEqe+PAE/fTWaTvC+pBh0PBBKdDeHoFwDW3QKX4/eeKbbPO3J5R+rF/VWWZ X/hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=KZVdx7x3iFUR2DUNEnTxY2scn/6HZfJOJuojLhgglFc=; b=NrZyIVLgCXLpdprs+PILprnfLPySG2Q94XV29TDMDX6GGsNQvW2vDZeYk7a9enuAcT VbIGfl/e6aD1cNIRXuSDu4MXMwbROU5DRqChBLe2GvI7Dzo4aOvLeUswgxXgzYTLGR4a Dtb0zBgi2MPvlj3GA+ltv3y6TjBe/FzaR3zasq1sdlBuDBqGfxlr2Wl6SfxbU6jqMBTi 1bmsgMCuIdIXHqidWZqEe4WZSc21oVaE06jksTR6TXua8xYyE8Ph+7hQ4SqJHSyhs8Dr UG3votgweTllE+KDCJEDcKtMPvS0hq+twxM5yQr5KLeKnHT1tg6OU5bezRVMNMxkzV5/ kpIg== X-Gm-Message-State: ANhLgQ2umsUS/BbtgPuYYJnzIkiYoxDd/yr47T6mHApk0QGdf44MtS9s dGvnc0N9yv27IDkfpjtsr77Gl640 X-Google-Smtp-Source: ADFU+vtwsa9qRsKKJoKHCNmu6xRFQ52Ht6CtzcYUoO+JslmxmbKdU90Flaih9zeUJkX/EJ1xxW0ziA== X-Received: by 2002:a63:33c2:: with SMTP id z185mr4427227pgz.125.1584442523350; Tue, 17 Mar 2020 03:55:23 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id f19sm2294745pgn.42.2020.03.17.03.55.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Mar 2020 03:55:22 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 17 Mar 2020 18:55:00 +0800 Message-Id: <20200317105501.2847-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 Subject: [FFmpeg-devel] [PATCH v1] avfilter/src_movie: Fix the loop function of dynamic logo X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang The following command will attempt to create the input and overlay test sequence for you. ./ffmpeg -f lavfi -i color=white:duration=100:r=25:size=1280x720 input.mkv ./ffmpeg -f lavfi -i "testsrc=duration=5:size=320x240:rate=25" overlay.mkv Please try with below command and compare the final output. ./ffmpeg -y -filter_complex "movie=./input.mkv,setpts=PTS-STARTPTS[main];movie=./overlay.mkv:loop=5,setpts=PTS-STARTPTS[overlay];[main][overlay]overlay=10:10: enable='between(t,0,25)" test.mkv Without the patch applied, the overlay will repeat the last frame in overlay.mkv after the first loop. Signed-off-by: Limin Wang --- libavfilter/src_movie.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c index 79423a8..2327046 100644 --- a/libavfilter/src_movie.c +++ b/libavfilter/src_movie.c @@ -68,6 +68,8 @@ typedef struct MovieContext { int loop_count; int64_t discontinuity_threshold; int64_t ts_offset; + int64_t last_pts; + int64_t last_loop_pts; AVFormatContext *format_ctx; int eof; @@ -455,6 +457,7 @@ static int rewind_file(AVFilterContext *ctx) movie->st[i].done = 0; } movie->eof = 0; + movie->last_loop_pts = movie->last_pts; return 0; } @@ -565,6 +568,8 @@ static int movie_push_frame(AVFilterContext *ctx, unsigned out_id) if (frame->pts != AV_NOPTS_VALUE) { if (movie->ts_offset) frame->pts += av_rescale_q_rnd(movie->ts_offset, AV_TIME_BASE_Q, outlink->time_base, AV_ROUND_UP); + if (movie->last_loop_pts) + frame->pts += movie->last_loop_pts; if (st->discontinuity_threshold) { if (st->last_pts != AV_NOPTS_VALUE) { int64_t diff = frame->pts - st->last_pts; @@ -575,6 +580,7 @@ static int movie_push_frame(AVFilterContext *ctx, unsigned out_id) } } } + movie->last_pts = st->last_pts = frame->pts; } ff_dlog(ctx, "movie_push_frame(): file:'%s' %s\n", movie->file_name, From patchwork Tue Mar 17 10:55:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 18261 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id C8B3044B679 for ; Tue, 17 Mar 2020 12:55:33 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B01AB68B5EC; Tue, 17 Mar 2020 12:55:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F201968B5E8 for ; Tue, 17 Mar 2020 12:55:26 +0200 (EET) Received: by mail-pj1-f43.google.com with SMTP id dw20so5094894pjb.0 for ; Tue, 17 Mar 2020 03:55:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=i9fmqcW0vs9esHetubcOtJbnQT1tTRznJjGFpeydFbA=; b=nOane3T58dDpe7UTcFrmuk+GG1j/MefUiFlrhwKzLxQPY9CXN2dIs8A3VAa+7b73a/ KhTVhB+HBT0TdZDOJ3vs6PoNhCuUMl4Cf3wJV40AdOHY0CunUmdjnCpM3jdBulgw+OPA LHTkOAYkCaDTVUWkhRaVZXjVDZtls7k5/JdFxp6vP3m0qWzuzVGDbJCkVtZmabDRxUEN gOEco7VdktvZlph7/cXIb+/O893aOraUEpyrV4jzBKKl3u6esYuJpvldkNHvVEhLMsR0 9T8Y0A4H/KUMK39Z+rzFRho46A0SypmjiJkUFQnOlyadsXL3j3oQ7kenrro8SBIobNdr mZCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=i9fmqcW0vs9esHetubcOtJbnQT1tTRznJjGFpeydFbA=; b=ihZVpxdIHI6wt1A+i9B2Mwrupcuc9xLFizJ/LuHEbLZQAJywsjHX2guHXeh16SZTmy Q1fRyw/mYLk0HRnTeWm4maZfbHpAK2C61zZUR/zQUes/JQop9pjMFrtefDurmR21b9lM LIOkGamkogiqBan2POOiAP5euxd7seAaj/5jJj3aj8cvyMHAZj2QcPoa9xaaiB+KaQ2n qiMbMfhj0WcLf+rtu0hnPIY1PMMXZGx3l6ie/+JCP2Ci70ykXDhRpSHWOoPI6YMUuNt1 WwU12N50eR2wRd6cgVkxSsWcF4G67gnmeAnS+AeUaBRekv7dMgvCWLTzMz8GDF1Oz2Ab ZqMg== X-Gm-Message-State: ANhLgQ21TBqAcyUuA+ZURSnMIzr83ndv3DlB2i55IT2WwdjrCnVCs5mB O+LqP3zclKtfhSb9bAJLIPhjccIh X-Google-Smtp-Source: ADFU+vt8HCInvpdZMxdSQDGHh3au2gInfjO/2T941aBsr2vePD1Lb6fNX+XhTRxauaU5m8q5EOFJ0g== X-Received: by 2002:a17:90a:8403:: with SMTP id j3mr4732177pjn.8.1584442524988; Tue, 17 Mar 2020 03:55:24 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id f19sm2294745pgn.42.2020.03.17.03.55.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Mar 2020 03:55:24 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 17 Mar 2020 18:55:01 +0800 Message-Id: <20200317105501.2847-2-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20200317105501.2847-1-lance.lmwang@gmail.com> References: <20200317105501.2847-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v1 2/2] avfilter/vf_overlay: remove the duplicated framesync option X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang After applied the patch, we can change default eof_action from repeat to pass still. ./ffmpeg -y -filter_complex "movie=./input.mkv,setpts=PTS-STARTPTS[main];movie=./overlay.mkv:loop=2,setpts=PTS-STARTPTS[overlay];[main][overlay]overlay=10:10: enable='between(t,0,25):eof_action=pass" test.mkv Signed-off-by: Limin Wang --- libavfilter/vf_overlay.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c index 0a8f089c0d..a481f74076 100644 --- a/libavfilter/vf_overlay.c +++ b/libavfilter/vf_overlay.c @@ -993,16 +993,9 @@ static int activate(AVFilterContext *ctx) static const AVOption overlay_options[] = { { "x", "set the x expression", OFFSET(x_expr), AV_OPT_TYPE_STRING, {.str = "0"}, CHAR_MIN, CHAR_MAX, FLAGS }, { "y", "set the y expression", OFFSET(y_expr), AV_OPT_TYPE_STRING, {.str = "0"}, CHAR_MIN, CHAR_MAX, FLAGS }, - { "eof_action", "Action to take when encountering EOF from secondary input ", - OFFSET(fs.opt_eof_action), AV_OPT_TYPE_INT, { .i64 = EOF_ACTION_REPEAT }, - EOF_ACTION_REPEAT, EOF_ACTION_PASS, .flags = FLAGS, "eof_action" }, - { "repeat", "Repeat the previous frame.", 0, AV_OPT_TYPE_CONST, { .i64 = EOF_ACTION_REPEAT }, .flags = FLAGS, "eof_action" }, - { "endall", "End both streams.", 0, AV_OPT_TYPE_CONST, { .i64 = EOF_ACTION_ENDALL }, .flags = FLAGS, "eof_action" }, - { "pass", "Pass through the main input.", 0, AV_OPT_TYPE_CONST, { .i64 = EOF_ACTION_PASS }, .flags = FLAGS, "eof_action" }, { "eval", "specify when to evaluate expressions", OFFSET(eval_mode), AV_OPT_TYPE_INT, {.i64 = EVAL_MODE_FRAME}, 0, EVAL_MODE_NB-1, FLAGS, "eval" }, { "init", "eval expressions once during initialization", 0, AV_OPT_TYPE_CONST, {.i64=EVAL_MODE_INIT}, .flags = FLAGS, .unit = "eval" }, { "frame", "eval expressions per-frame", 0, AV_OPT_TYPE_CONST, {.i64=EVAL_MODE_FRAME}, .flags = FLAGS, .unit = "eval" }, - { "shortest", "force termination when the shortest input terminates", OFFSET(fs.opt_shortest), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS }, { "format", "set output format", OFFSET(format), AV_OPT_TYPE_INT, {.i64=OVERLAY_FORMAT_YUV420}, 0, OVERLAY_FORMAT_NB-1, FLAGS, "format" }, { "yuv420", "", 0, AV_OPT_TYPE_CONST, {.i64=OVERLAY_FORMAT_YUV420}, .flags = FLAGS, .unit = "format" }, { "yuv422", "", 0, AV_OPT_TYPE_CONST, {.i64=OVERLAY_FORMAT_YUV422}, .flags = FLAGS, .unit = "format" }, @@ -1010,7 +1003,6 @@ static const AVOption overlay_options[] = { { "rgb", "", 0, AV_OPT_TYPE_CONST, {.i64=OVERLAY_FORMAT_RGB}, .flags = FLAGS, .unit = "format" }, { "gbrp", "", 0, AV_OPT_TYPE_CONST, {.i64=OVERLAY_FORMAT_GBRP}, .flags = FLAGS, .unit = "format" }, { "auto", "", 0, AV_OPT_TYPE_CONST, {.i64=OVERLAY_FORMAT_AUTO}, .flags = FLAGS, .unit = "format" }, - { "repeatlast", "repeat overlay of the last overlay frame", OFFSET(fs.opt_repeatlast), AV_OPT_TYPE_BOOL, {.i64=1}, 0, 1, FLAGS }, { "alpha", "alpha format", OFFSET(alpha_format), AV_OPT_TYPE_INT, {.i64=0}, 0, 1, FLAGS, "alpha_format" }, { "straight", "", 0, AV_OPT_TYPE_CONST, {.i64=0}, .flags = FLAGS, .unit = "alpha_format" }, { "premultiplied", "", 0, AV_OPT_TYPE_CONST, {.i64=1}, .flags = FLAGS, .unit = "alpha_format" },