From patchwork Thu Dec 29 14:33:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas George X-Patchwork-Id: 1977 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp2439459vsb; Thu, 29 Dec 2016 06:35:17 -0800 (PST) X-Received: by 10.194.190.229 with SMTP id gt5mr36519793wjc.212.1483022117316; Thu, 29 Dec 2016 06:35:17 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id tz15si58250184wjb.56.2016.12.29.06.35.16; Thu, 29 Dec 2016 06:35:17 -0800 (PST) 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 6CF11689C4A; Thu, 29 Dec 2016 16:34:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from nef2.ens.fr (nef2.ens.fr [129.199.96.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1FF03689B30 for ; Thu, 29 Dec 2016 16:34:10 +0200 (EET) Received: from phare.normalesup.org (archicubes.ens.fr [129.199.129.80]) by nef2.ens.fr (8.13.6/1.01.28121999) with ESMTP id uBTEYDbh080447 for ; Thu, 29 Dec 2016 15:34:13 +0100 (CET) Received: by phare.normalesup.org (Postfix, from userid 1001) id 17D63E00F9; Thu, 29 Dec 2016 15:34:13 +0100 (CET) From: Nicolas George To: ffmpeg-devel@ffmpeg.org Date: Thu, 29 Dec 2016 15:33:59 +0100 Message-Id: <20161229143403.2851-13-george@nsup.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20161229143403.2851-1-george@nsup.org> References: <20161229143403.2851-1-george@nsup.org> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (nef2.ens.fr [129.199.96.32]); Thu, 29 Dec 2016 15:34:13 +0100 (CET) Subject: [FFmpeg-devel] [PATCH 13/17] lavfi: add ff_inlink_set_frame_wanted(). 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Nicolas George --- libavfilter/avfilter.c | 8 ++++++++ libavfilter/filters.h | 8 ++++++++ 2 files changed, 16 insertions(+) Changes in this commit: rename ff_link -> ff_inlink and move to filters.h. diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 7e02d9ca8b..d7677d5f23 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -1634,6 +1634,14 @@ void ff_inlink_process_timeline(AVFilterLink *link, const AVFrame *frame) dstctx->is_disabled = fabs(av_expr_eval(dstctx->enable, dstctx->var_values, NULL)) < 0.5; } +void ff_inlink_set_frame_wanted(AVFilterLink *link) +{ + av_assert1(!link->status_in); + av_assert1(!link->status_out); + link->frame_wanted_out = 1; + ff_filter_set_ready(link->src, 100); +} + const AVClass *avfilter_get_class(void) { return &avfilter_class; diff --git a/libavfilter/filters.h b/libavfilter/filters.h index 95df86c911..4ffddf117f 100644 --- a/libavfilter/filters.h +++ b/libavfilter/filters.h @@ -100,4 +100,12 @@ int ff_inlink_make_frame_writable(AVFilterLink *link, AVFrame **rframe); */ int ff_inlink_acknowledge_status(AVFilterLink *link, int *rstatus); +/** + * Mark that a frame is wanted on the link. + * Unlike ff_filter_frame(), it must not be called when the link has a + * non-zero status, and thus does not acknowledge it. + * Also it cannot fail. + */ +void ff_inlink_set_frame_wanted(AVFilterLink *link); + #endif /* AVFILTER_FILTERS_H */