From patchwork Wed May 1 14:12:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moritz Barsnick X-Patchwork-Id: 12956 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 372AC446FA9 for ; Wed, 1 May 2019 17:13:14 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 11C8C68A7F4; Wed, 1 May 2019 17:13:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C952E68A7F4 for ; Wed, 1 May 2019 17:13:07 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1556719987; bh=NJ/GIfqlAZEZ1lLYnnc7BP0tK53ypVxGKmwXY+cdvPs=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=IrYlX3uaaLfgosi2xInbIwga5aAQXOQQPB7vRaupo8+JnHGmB679880s969+3Kr80 8I+nb6Yd1kRSCVODfzWR1BabFJoiFy1XVifIX7QbooArIQLXxLdHbhnIHAnP0M2O2I iEWW3A7VUjrIFHXocPJbBT03nqbuoN+utst94JKs= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from goodtimes.fritz.box ([89.182.224.147]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0MZOan-1h2vWR331R-00LBr3; Wed, 01 May 2019 16:13:06 +0200 From: Moritz Barsnick To: FFmpeg development discussions and patches Date: Wed, 1 May 2019 16:12:59 +0200 Message-Id: <20190501141259.24297-1-barsnick@gmx.net> X-Mailer: git-send-email 2.14.5 X-Provags-ID: V03:K1:ZEJgkyvXJokgyjyArmZOMsBefCPxNE1qhwywB4NVIu4pjU3S7OW 7cuIDfMyr+sZAXEZzOjvHXeet3zNcLzw+/5S5IdKs8cqM61sVJU9KAdELLKQ6tjsW7e95Qk yb0Kw6Er6AoZB9i4botpJcL2eT0trUDBugdJE45QZOmJBxosWYUymxDzRfA7JLWZbakeMB6 jLd37CiLEr9tOM+V2YEiA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:gD+uxZMSfes=:j0Hua9Cede0yy8GTsQv5Y7 J4xQ9Pgdt5jbCOhe31aQqC9vVcs/axdXRoUeGJDrl7WRy47t3cngTTzUmdaF7AfGIzT2lps4n sIxs3jInqClSZNTeQoxelR32ol+9gSaE3ZMtlvwHP0r3fu0jjtL4SHjkkZhXDD7ps71mQF8aS nDneYktfUJ5pB9eMkCXIfJpvbrI1O0l1nwMF+Dllikqwh1n9+5tMvF0jLgWGWqJHa2yaDN3dk IE/TyzgZWCzDqklwoNcmxZ/W0WMHOrsodJQFHBrdsAzuLvT3gL7GjB6g6cs1goOOheMVQ4NIw AtKxj+rhJO3yKpBeykhDeJyB0jEYwX1/UYilnrnLHuvu8wr8rDkbNCWPGqf+c1tudaUepFmrv J784jVmg+rCzbxwc4hJc66Pf76WYOQMG3YE0v2A/jBfyS6dWCgNgPtG/xbGN72GxGaGFarphp DVzOmtLfIxhZSzrntzw2jl9IlpkZ9SJ7XDoV13+e15gdYiTVPPJBKh5biLzIQkwKdf2WiF/3X Cd/z5WzQ1L4ikPrDqRe7DqVtGSGXabMy4rN/Ji0EHee6yQcm8ZvSM0ENVta8vJdLC8SNh4W03 Pi4EiM5b1FEMpqUn/osNGE3S66meUwh7tSIwTuEdEzrVpCLTGVKc+hDnCKudReJUDLZ4cruAO 9xj5vgYv3+3jYq1PsJUjEsXieMcVtNujMtD5TYkL5ZnBHYDzZk/Wl25oLSAHUntugAA8S9T5d trxqDbxQ5AvGJM5usrrKfuHhJiUnqInXvKi7HD5ClljosnKt29rxdomzdc3l7B+H8uQDI2NMt k+bMcjLamBJv35BOREL1FRkd/NxXXb2AiWocGaplGO409T360Y3t3Sg38lTHi4LZ70XNDZ2vU 5qmXm3BlXUueUi4zIpCyzLmCSylV4qxwSGCAyqch7IsbpnlNcHqF/JEdxR9/Qp Subject: [FFmpeg-devel] [PATCH v2] avfilter/f_realtime: add option to scale speed 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: Moritz Barsnick MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- doc/filters.texi | 8 ++++++++ libavfilter/f_realtime.c | 7 +++++-- 2 files changed, 13 insertions(+), 2 deletions(-) --- 2.14.5 diff --git a/doc/filters.texi b/doc/filters.texi index cd82869849..2f9333c3f3 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -21136,6 +21136,14 @@ They accept the following options: @item limit Time limit for the pauses. Any pause longer than that will be considered a timestamp discontinuity and reset the timer. Default is 2 seconds. +@item speed +Speed factor for processing. The value must be a float larger than zero. +Values larger than 1.0 will result in faster than realtime processing, +smaller will slow processing down. The @var{limit} is automatically adapted +accordingly. Default is 1.0. + +A processing speed faster than what is possible without these filters cannot +be achieved. @end table @anchor{select} diff --git a/libavfilter/f_realtime.c b/libavfilter/f_realtime.c index 171c16aaaa..6fd3559dac 100644 --- a/libavfilter/f_realtime.c +++ b/libavfilter/f_realtime.c @@ -22,11 +22,13 @@ #include "libavutil/time.h" #include "avfilter.h" #include "internal.h" +#include typedef struct RealtimeContext { const AVClass *class; int64_t delta; int64_t limit; + double speed; unsigned inited; } RealtimeContext; @@ -36,7 +38,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) RealtimeContext *s = ctx->priv; if (frame->pts != AV_NOPTS_VALUE) { - int64_t pts = av_rescale_q(frame->pts, inlink->time_base, AV_TIME_BASE_Q); + int64_t pts = av_rescale_q(frame->pts, inlink->time_base, AV_TIME_BASE_Q) / s->speed; int64_t now = av_gettime_relative(); int64_t sleep = pts - now + s->delta; if (!s->inited) { @@ -44,7 +46,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) sleep = 0; s->delta = now - pts; } - if (sleep > s->limit || sleep < -s->limit) { + if (FFABS(sleep) > s->limit / s->speed) { av_log(ctx, AV_LOG_WARNING, "time discontinuity detected: %"PRIi64" us, resetting\n", sleep); @@ -65,6 +67,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) #define FLAGS AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_FILTERING_PARAM static const AVOption options[] = { { "limit", "sleep time limit", OFFSET(limit), AV_OPT_TYPE_DURATION, { .i64 = 2000000 }, 0, INT64_MAX, FLAGS }, + { "speed", "speed factor", OFFSET(speed), AV_OPT_TYPE_DOUBLE, { .dbl = 1.0 }, DBL_MIN, DBL_MAX, FLAGS }, { NULL } };