From patchwork Tue Aug 28 19:40:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 10163 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp8015949jap; Tue, 28 Aug 2018 12:40:32 -0700 (PDT) X-Google-Smtp-Source: ANB0VdbpuDIEg7Cw/U/h8fRnW8a3GMaiDfePZ6VvQs3G8XcF+LVD9Cj7C6lA3src3kfrbshWjOlz X-Received: by 2002:a1c:e141:: with SMTP id y62-v6mr2349522wmg.138.1535485232250; Tue, 28 Aug 2018 12:40:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535485232; cv=none; d=google.com; s=arc-20160816; b=fnv+G7W4dFDUKpdRXGdqqw8YODO+AA2l5lFUkn9Ro1VrJIUl0V8vrqqyRKPcm79Rhf vs4LFg657zrML1Xb0A0yx8AtQzJRZWp4qHIFCYIBeUqTxcGys8HxpKFAUhDpuSkPMpiI Tme+g857sWIiFtTq+fEg6FeTU8qPipZ8yUZW/idzDXLoZHD3Ruq2toQdpGoz2+fGlIlC cIyvRU2EQ4YbejQjvBzgH1ngTh1K/2qQT2j8guq++lBrcgE51egj980lTrLhyuDs56qL 4YnvuHv0tvJKbBu8jis4xpoSH/mD7GLftwamASUOM4cL9EQiGxcMXuoW+kXlIexH/bh4 JESg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to :arc-authentication-results; bh=KbO/ZdmVpzjJTyiV1I669ErfFthzmND8/fCxJqg0U70=; b=fq0wQHVo9R+nXDSjc/tQeEsLdw0BnBKJ3aSQtSszjsj0VKpSZKocMjTSoZ/lH5F0aZ qQDKBbK/5ZF5GyNO5l8RLLlt/GHrM46wyNhmFKPifQ4OHVOQafRe6Yay6np8XDnbwIZI rB7yEwDBtMzVScEFzm5l5IJ1O0E5vQ2oFpmSFZFcoEZcpzcHwnWKOfsjje7jboNP9ga5 L9GlDJXcEiHA0l+idDU4WutXvgpSQIDNDcuBDXomFDDYL8oTTvzwWd9QhE0w8ZG2pUem 58KSuRrnX+8avnSCSF1yyNRMOd88DEiVOBztJBYM0bnTNGUy2vP8IjaY9JRKWuIwT0jz ld+g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g80-v6si1784909wmd.195.2018.08.28.12.40.31; Tue, 28 Aug 2018 12:40:32 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0DDE4689D42; Tue, 28 Aug 2018 22:40:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CAF93680320 for ; Tue, 28 Aug 2018 22:40:19 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 7EB20E0802; Tue, 28 Aug 2018 21:40:23 +0200 (CEST) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YP40aiVkLvlz; Tue, 28 Aug 2018 21:40:22 +0200 (CEST) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id E2502E0705; Tue, 28 Aug 2018 21:40:21 +0200 (CEST) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 Aug 2018 21:40:19 +0200 Message-Id: <20180828194019.11839-1-cus@passwd.hu> X-Mailer: git-send-email 2.16.4 Subject: [FFmpeg-devel] [PATCH] avfilter/vf_framerate: switch to activate 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: Marton Balint MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Marton Balint --- libavfilter/vf_framerate.c | 119 ++++++++++++++++++++++++--------------------- 1 file changed, 63 insertions(+), 56 deletions(-) diff --git a/libavfilter/vf_framerate.c b/libavfilter/vf_framerate.c index 3e2615be5e..fb65381923 100644 --- a/libavfilter/vf_framerate.c +++ b/libavfilter/vf_framerate.c @@ -38,6 +38,7 @@ #include "avfilter.h" #include "internal.h" #include "video.h" +#include "filters.h" #include "framerate.h" #define OFFSET(x) offsetof(FrameRateContext, x) @@ -360,53 +361,81 @@ static int config_input(AVFilterLink *inlink) return 0; } -static int filter_frame(AVFilterLink *inlink, AVFrame *inpicref) +static int activate(AVFilterContext *ctx) { - int ret; - AVFilterContext *ctx = inlink->dst; + int ret, status; + AVFilterLink *inlink = ctx->inputs[0]; + AVFilterLink *outlink = ctx->outputs[0]; FrameRateContext *s = ctx->priv; + AVFrame *inpicref; int64_t pts; - if (inpicref->interlaced_frame) - av_log(ctx, AV_LOG_WARNING, "Interlaced frame found - the output will not be correct.\n"); + FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink); - if (inpicref->pts == AV_NOPTS_VALUE) { - av_log(ctx, AV_LOG_WARNING, "Ignoring frame without PTS.\n"); - return 0; +retry: + ret = process_work_frame(ctx); + if (ret < 0) + return ret; + else if (ret == 1) + return ff_filter_frame(outlink, s->work); + + ret = ff_inlink_consume_frame(inlink, &inpicref); + if (ret < 0) + return ret; + + if (inpicref) { + if (inpicref->interlaced_frame) + av_log(ctx, AV_LOG_WARNING, "Interlaced frame found - the output will not be correct.\n"); + + if (inpicref->pts == AV_NOPTS_VALUE) { + av_log(ctx, AV_LOG_WARNING, "Ignoring frame without PTS.\n"); + av_frame_free(&inpicref); + } } - pts = av_rescale_q(inpicref->pts, s->srce_time_base, s->dest_time_base); - if (s->f1 && pts == s->pts1) { - av_log(ctx, AV_LOG_WARNING, "Ignoring frame with same PTS.\n"); - return 0; + if (inpicref) { + pts = av_rescale_q(inpicref->pts, s->srce_time_base, s->dest_time_base); + + if (s->f1 && pts == s->pts1) { + av_log(ctx, AV_LOG_WARNING, "Ignoring frame with same PTS.\n"); + av_frame_free(&inpicref); + } } - av_frame_free(&s->f0); - s->f0 = s->f1; - s->pts0 = s->pts1; - s->f1 = inpicref; - s->pts1 = pts; - s->delta = s->pts1 - s->pts0; - s->score = -1.0; - - if (s->delta < 0) { - av_log(ctx, AV_LOG_WARNING, "PTS discontinuity.\n"); - s->start_pts = s->pts1; - s->n = 0; + if (inpicref) { av_frame_free(&s->f0); + s->f0 = s->f1; + s->pts0 = s->pts1; + s->f1 = inpicref; + s->pts1 = pts; + s->delta = s->pts1 - s->pts0; + s->score = -1.0; + + if (s->delta < 0) { + av_log(ctx, AV_LOG_WARNING, "PTS discontinuity.\n"); + s->start_pts = s->pts1; + s->n = 0; + av_frame_free(&s->f0); + } + + if (s->start_pts == AV_NOPTS_VALUE) + s->start_pts = s->pts1; + + goto retry; } - if (s->start_pts == AV_NOPTS_VALUE) - s->start_pts = s->pts1; + if (ff_inlink_acknowledge_status(inlink, &status, &pts)) { + if (!s->flush) { + s->flush = 1; + goto retry; + } + ff_outlink_set_status(outlink, status, pts); + return 0; + } - do { - ret = process_work_frame(ctx); - if (ret <= 0) - return ret; - ret = ff_filter_frame(ctx->outputs[0], s->work); - } while (ret >= 0); + FF_FILTER_FORWARD_WANTED(outlink, inlink); - return ret; + return FFERROR_NOT_READY; } static int config_output(AVFilterLink *outlink) @@ -454,33 +483,11 @@ static int config_output(AVFilterLink *outlink) return 0; } -static int request_frame(AVFilterLink *outlink) -{ - AVFilterContext *ctx = outlink->src; - FrameRateContext *s = ctx->priv; - int ret; - - ff_dlog(ctx, "request_frame()\n"); - - ret = ff_request_frame(ctx->inputs[0]); - if (ret == AVERROR_EOF && s->f1 && !s->flush) { - s->flush = 1; - ret = process_work_frame(ctx); - if (ret < 0) - return ret; - ret = ret ? ff_filter_frame(ctx->outputs[0], s->work) : AVERROR_EOF; - } - - ff_dlog(ctx, "request_frame() source's request_frame() returned:%d\n", ret); - return ret; -} - static const AVFilterPad framerate_inputs[] = { { .name = "default", .type = AVMEDIA_TYPE_VIDEO, .config_props = config_input, - .filter_frame = filter_frame, }, { NULL } }; @@ -489,7 +496,6 @@ static const AVFilterPad framerate_outputs[] = { { .name = "default", .type = AVMEDIA_TYPE_VIDEO, - .request_frame = request_frame, .config_props = config_output, }, { NULL } @@ -506,4 +512,5 @@ AVFilter ff_vf_framerate = { .inputs = framerate_inputs, .outputs = framerate_outputs, .flags = AVFILTER_FLAG_SLICE_THREADS, + .activate = activate, };