From patchwork Thu May 30 18:36:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 13346 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 1027044647F for ; Thu, 30 May 2019 21:42:59 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E9C8C68A7EC; Thu, 30 May 2019 21:42:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5525B68A723 for ; Thu, 30 May 2019 21:42:53 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id r7so4826123wrr.13 for ; Thu, 30 May 2019 11:42:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=7bhG/CRRYTCeY1yhdr6HLTm6n7Ejw8JbEfucOdbilrA=; b=oWHJ1f1aVre3xy+J2eoydctFGgYFLpfyca+ggM252sYmu+CyePfWjUYLXwF2Nqm4nA 4MlFz+hgkzoid7ub2d+tSfKQFWFV20bp2YKhjZEfzyDFS1a16LRJAlzUtR9qX91CdFGR 8LCnZDWuA3Q7WweSzDVEAsWov1eBNRd0w8g2Bm/+UcRSO73PNWwAkJwTLpwmq+7qDlLr Xq5RHNQsszk8bJBKG6IaAGzbSyWeCsua2CallxeTs3NrzO3SauWFb2FLQixQ12V6CFM8 d+dty9FWLW5G7IzC7XfOXv1DKkBUpbqvZeUsAvD9H4m3YUySIfAZ9i41g3Ecs8DkbNSd 1ELQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=7bhG/CRRYTCeY1yhdr6HLTm6n7Ejw8JbEfucOdbilrA=; b=K6/AVE1BBdljEMo+7d5CCXAjU0mmtIiHSP5sFbCd+Lo32ghZ0mrMb9UxqCG3JoucQD lnQ6J1VRkWM15rCvhGwafqQvSu8CkugIJxIu5hw2ISKny4AXuXAEEZmztGBIo3CGio9W a3UfiAKFAvguxthfuObYPPzuQ0NErzQQHDiD2nUsw3ePHHoCkua1kprKfNiW7eLvJcGA dbptt8FnVro8FmqdvvaZsKh3WILUTQx5Aafx6WDiff++33XoGNiRxKnt+2TiYOhRqOfe bx9dGPgBoCQhGR2QqyOMtLjpA5yd5vVSQh06XbXxXvo0L5nMbZ29168wsLRKDRcP8Mvq 1iBw== X-Gm-Message-State: APjAAAUlhoIX/Bjs7FgWBE3XTl1zqY20zeW92JGAjmi7wkw+akgdpUCj h/OCARkaZaGXujGQKRDTw+pfAdip X-Google-Smtp-Source: APXvYqwV/tlin0tGxd0/09wNTGooYWUd2QgF9N8r6ntc5dOEPGXyR7wOwHEtLW05QHSEEkY+YMinIw== X-Received: by 2002:a5d:644e:: with SMTP id d14mr3719837wrw.42.1559241375938; Thu, 30 May 2019 11:36:15 -0700 (PDT) Received: from localhost.localdomain ([37.244.240.194]) by smtp.gmail.com with ESMTPSA id i12sm2131594wrs.43.2019.05.30.11.36.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 May 2019 11:36:15 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 May 2019 20:36:01 +0200 Message-Id: <20190530183601.3892-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avilter/avf_showwaves: switch to activate in showwaves filter 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: Paul B Mahol --- libavfilter/avf_showwaves.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/libavfilter/avf_showwaves.c b/libavfilter/avf_showwaves.c index d85ebd9050..afe05fb504 100644 --- a/libavfilter/avf_showwaves.c +++ b/libavfilter/avf_showwaves.c @@ -29,6 +29,7 @@ #include "libavutil/opt.h" #include "libavutil/parseutils.h" #include "avfilter.h" +#include "filters.h" #include "formats.h" #include "audio.h" #include "video.h" @@ -706,7 +707,8 @@ static int showwaves_filter_frame(AVFilterLink *inlink, AVFrame *insamples) showwaves->sample_count_mod = 0; showwaves->buf_idx++; } - if (showwaves->buf_idx == showwaves->w) + if (showwaves->buf_idx == showwaves->w || + (ff_outlink_get_status(inlink) && i == nb_samples - 1)) if ((ret = push_frame(outlink)) < 0) break; outpicref = showwaves->outpicref; @@ -717,11 +719,33 @@ end: return ret; } +static int activate(AVFilterContext *ctx) +{ + AVFilterLink *inlink = ctx->inputs[0]; + AVFilterLink *outlink = ctx->outputs[0]; + ShowWavesContext *showwaves = ctx->priv; + AVFrame *in; + const int nb_samples = showwaves->n * outlink->w; + int ret; + + FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink); + + ret = ff_inlink_consume_samples(inlink, nb_samples, nb_samples, &in); + if (ret < 0) + return ret; + if (ret > 0) + return showwaves_filter_frame(inlink, in); + + FF_FILTER_FORWARD_STATUS(inlink, outlink); + FF_FILTER_FORWARD_WANTED(outlink, inlink); + + return FFERROR_NOT_READY; +} + static const AVFilterPad showwaves_inputs[] = { { .name = "default", .type = AVMEDIA_TYPE_AUDIO, - .filter_frame = showwaves_filter_frame, }, { NULL } }; @@ -731,7 +755,6 @@ static const AVFilterPad showwaves_outputs[] = { .name = "default", .type = AVMEDIA_TYPE_VIDEO, .config_props = config_output, - .request_frame = request_frame, }, { NULL } }; @@ -744,6 +767,7 @@ AVFilter ff_avf_showwaves = { .query_formats = query_formats, .priv_size = sizeof(ShowWavesContext), .inputs = showwaves_inputs, + .activate = activate, .outputs = showwaves_outputs, .priv_class = &showwaves_class, };