From patchwork Sat Jul 27 12:18:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 14094 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 7D03B44976E for ; Sat, 27 Jul 2019 15:24:22 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5001068ABD6; Sat, 27 Jul 2019 15:24:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DA69168A544 for ; Sat, 27 Jul 2019 15:24:15 +0300 (EEST) Received: by mail-pl1-f193.google.com with SMTP id ay6so25780595plb.9 for ; Sat, 27 Jul 2019 05:24:15 -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=FuWJu6Cp2bdM9lib/SLzLTf+TEofyE3jr03XEoFQwFA=; b=OkhzDF4a2GC3JQOJ6RuxOZlymY9krg4lBBvKRIUMFIywVrb3ATv2w3BDOQ/fscme/J p6tpcInSYnogNzvLrfzLvjTSpXJ/7bFsUsRwzJ2CSKxijO/aX2oUn0QJdmvNX3ZAwsui /IfdN1QQW3TNdXceGyEkWhE8tZzFJoZdv3/rRqyd344JSvaPB4Nm0hxnHg56rLWSTUoG tMl0X7Akn94eO03udWO0ORVg4RQJvPh4tWoen2TfAFrV707j6VZZWIIcJevrh/xlLGdg EsbDTs2lb7tn2KA3PmwXcEyxRc9lDOm8b8F5IyIyrAARLRoI1dlrDjsx+75ZdbWT+Qbo dCoA== 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=FuWJu6Cp2bdM9lib/SLzLTf+TEofyE3jr03XEoFQwFA=; b=ktqHz02hboG9ELU/Fso762R/bsfNvOn+++fnQH76Vn2/0qeA3a4uoqAjcFoQIwrQIL 1Ce1zKhRruRTDHTp+9O1MXccOQgFOkGBodyUk6ExHP7YbrJEzz2InaLdQqDQ68DjYOv6 b3JfA4cpx1ebOk13j1WU3EbDKm5ReSQXo3V64s5Ec107Hp1jTfn35is+XIImN6hGZ3+y IwdFKaiyn3SZs9i5R+f0AVPcOQg+m27++08KgTehFdUnpUh6oRfIG2Jom/VZ18GTmdUq r675he7bMT4DWa2WxiFljciadwbvDmfVZ+nczZNXXa7VYNZ2gvQ8LSpxSc2blQBAcwYX qE8w== X-Gm-Message-State: APjAAAWJlarmf0qfl3GNrBy44WZ4kRaoFz1VAKmltq3B4NY263lcQdbD pGTAfPizlWd8iumZvNs9swbwgoiY X-Google-Smtp-Source: APXvYqyNuZGy+wnGRni6b3t/lPWVmkPLxUHSFE5cWPrfqwQb7QNCmGwWQTti72fGlI6uWryp9AfjOg== X-Received: by 2002:a17:902:d81:: with SMTP id 1mr105188467plv.323.1564229911149; Sat, 27 Jul 2019 05:18:31 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id p67sm65004331pfg.124.2019.07.27.05.18.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 27 Jul 2019 05:18:30 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 27 Jul 2019 20:18:17 +0800 Message-Id: <20190727121817.22390-2-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20190727121817.22390-1-lance.lmwang@gmail.com> References: <20190727121817.22390-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v1 2/2] avfilter/vf_scale: change filter_frame interface to activate interface 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 It's for the frame thread support later, once I have finished frame thread fate testing, I'll submit for review. Signed-off-by: Limin Wang --- libavfilter/vf_scale.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index efb480d..cce7ba0 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -27,6 +27,7 @@ #include #include "avfilter.h" +#include "filters.h" #include "formats.h" #include "internal.h" #include "scale.h" @@ -545,6 +546,41 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) return ret; } +static int activate(AVFilterContext *ctx) +{ + AVFilterLink *inlink = ctx->inputs[0]; + AVFilterLink *outlink = ctx->outputs[0]; + AVFrame *in, *out; + int64_t pts; + int ret, status; + int got_frame = 0; + + FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink); + + ret = ff_inlink_consume_frame(inlink, &in); + if (ret > 0) { + ret = scale_frame(inlink, in, &out, &got_frame); + if (ret) + return ret; + } + + if (ff_inlink_acknowledge_status(inlink, &status, &pts)) { + if (status == AVERROR_EOF) { + /* frame flushing */ + } + + ff_outlink_set_status(outlink, status, pts); + return ret; + } + + if (got_frame) + return ff_filter_frame(outlink, out); + + FF_FILTER_FORWARD_WANTED(outlink, inlink); + + return FFERROR_NOT_READY; +} + static int filter_frame_ref(AVFilterLink *link, AVFrame *in) { AVFilterLink *outlink = link->dst->outputs[1]; @@ -643,7 +679,6 @@ static const AVFilterPad avfilter_vf_scale_inputs[] = { { .name = "default", .type = AVMEDIA_TYPE_VIDEO, - .filter_frame = filter_frame, }, { NULL } }; @@ -662,6 +697,7 @@ AVFilter ff_vf_scale = { .description = NULL_IF_CONFIG_SMALL("Scale the input video size and/or convert the image format."), .init_dict = init_dict, .uninit = uninit, + .activate = activate, .query_formats = query_formats, .priv_size = sizeof(ScaleContext), .priv_class = &scale_class,