From patchwork Thu Dec 29 14:33:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas George X-Patchwork-Id: 1981 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp2439890vsb; Thu, 29 Dec 2016 06:36:21 -0800 (PST) X-Received: by 10.194.54.99 with SMTP id i3mr36663217wjp.86.1483022181872; Thu, 29 Dec 2016 06:36:21 -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 i6si54545242wmf.38.2016.12.29.06.36.21; Thu, 29 Dec 2016 06:36:21 -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 6C57D689D6B; Thu, 29 Dec 2016 16:34:17 +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 E5370689B6B for ; Thu, 29 Dec 2016 16:34:06 +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 uBTEY9BW080428 for ; Thu, 29 Dec 2016 15:34:10 +0100 (CET) Received: by phare.normalesup.org (Postfix, from userid 1001) id E3837E00F9; Thu, 29 Dec 2016 15:34:09 +0100 (CET) From: Nicolas George To: ffmpeg-devel@ffmpeg.org Date: Thu, 29 Dec 2016 15:33:54 +0100 Message-Id: <20161229143403.2851-8-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:10 +0100 (CET) Subject: [FFmpeg-devel] [PATCH 08/17] lavfi: add helpers to consume frames from link FIFOs. 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 | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++ libavfilter/filters.h | 42 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+) Changes in this commit: rename ff_link -> ff_inlink and move to filters.h, remove the _sure variants and document practice. diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index d31c9f738b..2183a84395 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -1498,6 +1498,58 @@ int ff_inlink_acknowledge_status(AVFilterLink *link, int *rstatus) return 1; } +int ff_inlink_check_available_frame(AVFilterLink *link) +{ + return ff_framequeue_queued_frames(&link->fifo) > 0; +} + +int ff_inlink_check_available_samples(AVFilterLink *link, unsigned min) +{ + uint64_t samples = ff_framequeue_queued_samples(&link->fifo); + av_assert1(min); + return samples >= min || (link->status_in && samples); +} + +static void consume_update(AVFilterLink *link, const AVFrame *frame) +{ + ff_inlink_process_commands(link, frame); + ff_inlink_process_timeline(link, frame); + link->frame_count_out++; +} + +int ff_inlink_consume_frame(AVFilterLink *link, AVFrame **rframe) +{ + AVFrame *frame; + + *rframe = NULL; + if (!ff_inlink_check_available_frame(link)) + return 0; + frame = ff_framequeue_take(&link->fifo); + consume_update(link, frame); + *rframe = frame; + return 1; +} + +int ff_inlink_consume_samples(AVFilterLink *link, unsigned min, unsigned max, + AVFrame **rframe) +{ + AVFrame *frame; + int ret; + + av_assert1(min); + *rframe = NULL; + if (!ff_inlink_check_available_samples(link, min)) + return 0; + if (link->status_in) + min = FFMIN(min, ff_framequeue_queued_samples(&link->fifo)); + ret = take_samples(link, min, link->max_samples, &frame); + if (ret < 0) + return ret; + consume_update(link, frame); + *rframe = frame; + return 1; +} + int ff_inlink_make_frame_writable(AVFilterLink *link, AVFrame **rframe) { AVFrame *frame = *rframe; diff --git a/libavfilter/filters.h b/libavfilter/filters.h index 69a29c640f..95df86c911 100644 --- a/libavfilter/filters.h +++ b/libavfilter/filters.h @@ -45,6 +45,48 @@ void ff_inlink_process_commands(AVFilterLink *link, const AVFrame *frame); void ff_inlink_process_timeline(AVFilterLink *link, const AVFrame *frame); /** + * Test if a frame is available on the link. + * @return >0 if a frame is available + */ +int ff_inlink_check_available_frame(AVFilterLink *link); + +/** + * Test if enough samples are available on the link. + * @return >0 if enough samples are available + * @note on EOF and error, min becomes 1 + */ +int ff_inlink_check_available_samples(AVFilterLink *link, unsigned min); + +/** + * Take a frame from the link's FIFO and update the link's stats. + * + * If ff_inlink_check_available_frame() was previously called, the + * preferred way of expressing it is "av_assert1(ret);" immediately after + * ff_inlink_consume_frame(). Negative error codes must still be checked. + * + * @note May trigger process_command() and/or update is_disabled. + * @return >0 if a frame is available, + * 0 and set rframe to NULL if no frame available, + * or AVERROR code + */ +int ff_inlink_consume_frame(AVFilterLink *link, AVFrame **rframe); + +/** + * Take samples from the link's FIFO and update the link's stats. + * + * If ff_inlink_check_available_samples() was previously called, the + * preferred way of expressing it is "av_assert1(ret);" immediately after + * ff_inlink_consume_samples(). Negative error codes must still be checked. + * + * @note May trigger process_command() and/or update is_disabled. + * @return >0 if a frame is available, + * 0 and set rframe to NULL if no frame available, + * or AVERROR code + */ +int ff_inlink_consume_samples(AVFilterLink *link, unsigned min, unsigned max, + AVFrame **rframe); + +/** * Make sure a frame is writable. * This is similar to av_frame_make_writable() except it uses the link's * buffer allocation callback, and therefore allows direct rendering.