From patchwork Sat Oct 6 12:30:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 10624 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:ab0:73d2:0:0:0:0:0 with SMTP id m18csp1522579uaq; Sat, 6 Oct 2018 05:30:31 -0700 (PDT) X-Google-Smtp-Source: ACcGV62nQ8rmKv7cKGFtTR68xLQA2/FA3e9McZ1811ZwiFSoCNUlY9A6lgsyrkaaNUcc+0kHOBv5 X-Received: by 2002:a1c:3c4:: with SMTP id 187-v6mr9955935wmd.90.1538829031254; Sat, 06 Oct 2018 05:30:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538829031; cv=none; d=google.com; s=arc-20160816; b=KNSNBNrV8HttQvY17pUvZeyhji7OUkv1pimnYJkjiWO+SNjPpXkcX2qTVmlHns3f+a CBjFVmx+yEFNKTEiQg2Y1KO15BmPEYl3AbDa/rGTj04eZSu/WbYxNshJ09/GNhV6OeyV 83i1nuTuKG5TJ0CnETL2XJTV+0RDXKb3xIY2M9A4z/ZqqYmuadw0RKgQZCqUi9IXnh/+ A9j9Bm9JBtsBY42MG5ZZtjrEFsMnDdN1MAiBlhNjByD3rZyrO/ukFgM9eF84KCI+LG9+ fpJcGaafUcJo8EAfhRBvQ+0kx3fT1x6T2aNugLozC+dqms+20gb6rd3Ou5pBLhZ3EqPd Ht3w== 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:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=iy+R91MPABqOvl583aLXpcoAjm5bSiefMbR7Ba2wk84=; b=EgcaShpXzimxAP1UqQZl6WPmrjaX5JI6kMd8iRFegwq29PJSoNu6pQWlOq6Xs3f0Ue d0wcyrAz+hVBuW8IR4N5yR/9XaPETEAvWlNow5GMLF79dG/uWmRruhA8WAk8VywQVGWS /HqdRfchaRUKPodmBBDxkHzFsuEevHdcXGhg4nuQmwDQ/l3I6beTTqABf7FhRYK2syKU 0feFijyWvqIszYWHj+uryqZbB3pa5l10hoytDav7F+qEIqaBUyEAP9BlAvgMLQLBUnJe uuLgl0tNRr8oR04Vsmc/BZVTERk6c7HPPd61U1sSrKySUZoXGXQQHuyNgwCeJ8mN1aMN Fiqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=FBVyTUha; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id j8-v6si8864339wrs.82.2018.10.06.05.30.30; Sat, 06 Oct 2018 05:30:31 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=FBVyTUha; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4B51E689BFC; Sat, 6 Oct 2018 15:30:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 95B686800A8 for ; Sat, 6 Oct 2018 15:30:00 +0300 (EEST) Received: by mail-ed1-f53.google.com with SMTP id f38-v6so13828769edd.8 for ; Sat, 06 Oct 2018 05:30:21 -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=HbONj/xt5hiLg/P1KuSHofzd/q9xcVFzjK+SNA52Was=; b=FBVyTUhau8HbWbi2IqCQ3XaIJegb4ezEAKJM9UkxfwQ/WoecOoGkLfEa0PoYIpFrVi 5XSyB68bwIQvtKyPQHSFkcMq83da9alzcdZKNFidSxy+/BqJ2qv8AQTCUX/TxkfbucZc vd2+ThJFQsSbRrPF7b2RamTdBASQrdIbcjlTSfmGTEMkzSfwXIGl6Bt4pDXbHj+gYGm5 VJVCsjsc0SAF0sLq4bxDc8fGglm3jy7HONyJ3kIGaX4ypGUYpzjo0XdM1x6pFBnTgV+q 3kKHU4t0DhaWtwk02D5YFbRNEC+QtmmPLvdWDvfvYLNy/yNa3XgtFfV4S0DowOJCJqLz FkMA== 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=HbONj/xt5hiLg/P1KuSHofzd/q9xcVFzjK+SNA52Was=; b=A2v1jZJaWXCh+35zMSG7uH7MEx7XHseMGD8TUNJhYvppv34OvRUYwCkwCpdcLF8neP Qkqwk4FnVwQu9+ZoWv/ni0u+e53L+BUPmO4Y0f+jfrFdYqr2JkIu+yZo5ffRufq2xm8g QvgFzbMFxSYnZh1miJZHsnTCXckWbUDBmDfWOvned/p7GQ9K5CM1iWY0UjFG8O69bWS2 o61OcwsVZEWC7nAWB1U2ex8l4lDwfKwa7lJUVcaxZtqg85TPg4xt+JDH77O6J9UujNbB m/jJcJvZ5hSWGPzYIZSKNOxR2A1XZhkchFvYOh7xqpwXIlVo0R9IJdQ2qxHiDy+lfhHr CioA== X-Gm-Message-State: ABuFfoiRDo89EoENwtlp3cIQFQ1iQQkgnGIByikujIb6FrVquZb4EgsD AeJDrHYFC1zCbF9CR+/malUhv5W4CZs= X-Received: by 2002:a05:6402:50e:: with SMTP id m14mr19626914edv.22.1538829020672; Sat, 06 Oct 2018 05:30:20 -0700 (PDT) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id b12-v6sm1882197eje.36.2018.10.06.05.30.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 06 Oct 2018 05:30:19 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 6 Oct 2018 14:30:10 +0200 Message-Id: <20181006123011.17742-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/2] avfilter/avf_showspectrum: 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- libavfilter/avf_showspectrum.c | 121 ++++++++++++++++++--------------- 1 file changed, 66 insertions(+), 55 deletions(-) diff --git a/libavfilter/avf_showspectrum.c b/libavfilter/avf_showspectrum.c index f5e8561713..30238e0c3f 100644 --- a/libavfilter/avf_showspectrum.c +++ b/libavfilter/avf_showspectrum.c @@ -38,6 +38,7 @@ #include "audio.h" #include "video.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "window_func.h" @@ -79,11 +80,13 @@ typedef struct ShowSpectrumContext { double win_scale; float overlap; float gain; + int consumed; int hop_size; float *combine_buffer; ///< color combining buffer (3 * h items) float **color_buffer; ///< color buffer (3 * h * ch items) AVAudioFifo *fifo; int64_t pts; + int eof; int single_pic; int legend; int start_x, start_y; @@ -956,67 +959,51 @@ static int plot_spectrum_column(AVFilterLink *inlink, AVFrame *insamples) ret = ff_filter_frame(outlink, av_frame_clone(s->outpicref)); if (ret < 0) return ret; + return 0; } - return s->win_size; + return 1; } #if CONFIG_SHOWSPECTRUM_FILTER -static int request_frame(AVFilterLink *outlink) +static int activate(AVFilterContext *ctx) { - ShowSpectrumContext *s = outlink->src->priv; - AVFilterLink *inlink = outlink->src->inputs[0]; - unsigned i; + AVFilterLink *inlink = ctx->inputs[0]; + AVFilterLink *outlink = ctx->outputs[0]; + ShowSpectrumContext *s = ctx->priv; int ret; - ret = ff_request_frame(inlink); - if (ret == AVERROR_EOF && s->sliding == FULLFRAME && s->xpos > 0 && - s->outpicref) { - if (s->orientation == VERTICAL) { - for (i = 0; i < outlink->h; i++) { - memset(s->outpicref->data[0] + i * s->outpicref->linesize[0] + s->xpos, 0, outlink->w - s->xpos); - memset(s->outpicref->data[1] + i * s->outpicref->linesize[1] + s->xpos, 128, outlink->w - s->xpos); - memset(s->outpicref->data[2] + i * s->outpicref->linesize[2] + s->xpos, 128, outlink->w - s->xpos); - } - } else { - for (i = s->xpos; i < outlink->h; i++) { - memset(s->outpicref->data[0] + i * s->outpicref->linesize[0], 0, outlink->w); - memset(s->outpicref->data[1] + i * s->outpicref->linesize[1], 128, outlink->w); - memset(s->outpicref->data[2] + i * s->outpicref->linesize[2], 128, outlink->w); - } - } - ret = ff_filter_frame(outlink, s->outpicref); - s->outpicref = NULL; - } - - return ret; -} + FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink); -static int filter_frame(AVFilterLink *inlink, AVFrame *insamples) -{ - AVFilterContext *ctx = inlink->dst; - ShowSpectrumContext *s = ctx->priv; - AVFrame *fin = NULL; - int ret = 0, consumed = 0; + if (av_audio_fifo_size(s->fifo) < s->win_size) { + AVFrame *frame = NULL; - if (s->pts == AV_NOPTS_VALUE) - s->pts = insamples->pts - av_audio_fifo_size(s->fifo); + ret = ff_inlink_consume_samples(inlink, s->win_size, s->win_size, &frame); + if (ret < 0) + return ret; + if (ret > 0) { + s->pts = frame->pts - av_audio_fifo_size(s->fifo); + s->consumed = 0; - av_audio_fifo_write(s->fifo, (void **)insamples->extended_data, insamples->nb_samples); - av_frame_free(&insamples); - while (av_audio_fifo_size(s->fifo) >= s->win_size) { - fin = ff_get_audio_buffer(inlink, s->win_size); - if (!fin) { - ret = AVERROR(ENOMEM); - goto fail; + av_audio_fifo_write(s->fifo, (void **)frame->extended_data, frame->nb_samples); + av_frame_free(&frame); } + } - fin->pts = s->pts + consumed; - consumed += s->hop_size; - ret = av_audio_fifo_peek(s->fifo, (void **)fin->extended_data, s->win_size); - if (ret < 0) - goto fail; + if (s->outpicref && av_audio_fifo_size(s->fifo) >= s->win_size) { + AVFrame *fin = ff_get_audio_buffer(inlink, s->win_size); + if (!fin) + return AVERROR(ENOMEM); + + fin->pts = s->pts + s->consumed; + s->consumed += s->hop_size; + ret = av_audio_fifo_peek(s->fifo, (void **)fin->extended_data, + FFMIN(s->win_size, av_audio_fifo_size(s->fifo))); + if (ret < 0) { + av_frame_free(&fin); + return ret; + } av_assert0(fin->nb_samples == s->win_size); @@ -1031,21 +1018,45 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples) ret = plot_spectrum_column(inlink, fin); av_frame_free(&fin); av_audio_fifo_drain(s->fifo, s->hop_size); - if (ret < 0) - goto fail; + if (ret <= 0) + return ret; } -fail: - s->pts = AV_NOPTS_VALUE; - av_frame_free(&fin); - return ret; + if (ff_outlink_get_status(inlink) == AVERROR_EOF && + s->sliding == FULLFRAME && + s->xpos > 0 && s->outpicref) { + int64_t pts; + + if (s->orientation == VERTICAL) { + for (int i = 0; i < outlink->h; i++) { + memset(s->outpicref->data[0] + i * s->outpicref->linesize[0] + s->xpos, 0, outlink->w - s->xpos); + memset(s->outpicref->data[1] + i * s->outpicref->linesize[1] + s->xpos, 128, outlink->w - s->xpos); + memset(s->outpicref->data[2] + i * s->outpicref->linesize[2] + s->xpos, 128, outlink->w - s->xpos); + } + } else { + for (int i = s->xpos; i < outlink->h; i++) { + memset(s->outpicref->data[0] + i * s->outpicref->linesize[0], 0, outlink->w); + memset(s->outpicref->data[1] + i * s->outpicref->linesize[1], 128, outlink->w); + memset(s->outpicref->data[2] + i * s->outpicref->linesize[2], 128, outlink->w); + } + } + pts = s->outpicref->pts; + ret = ff_filter_frame(outlink, s->outpicref); + s->outpicref = NULL; + ff_outlink_set_status(outlink, AVERROR_EOF, pts); + return 0; + } + + FF_FILTER_FORWARD_STATUS(inlink, outlink); + FF_FILTER_FORWARD_WANTED(outlink, inlink); + + return FFERROR_NOT_READY; } static const AVFilterPad showspectrum_inputs[] = { { .name = "default", .type = AVMEDIA_TYPE_AUDIO, - .filter_frame = filter_frame, }, { NULL } }; @@ -1055,7 +1066,6 @@ static const AVFilterPad showspectrum_outputs[] = { .name = "default", .type = AVMEDIA_TYPE_VIDEO, .config_props = config_output, - .request_frame = request_frame, }, { NULL } }; @@ -1068,6 +1078,7 @@ AVFilter ff_avf_showspectrum = { .priv_size = sizeof(ShowSpectrumContext), .inputs = showspectrum_inputs, .outputs = showspectrum_outputs, + .activate = activate, .priv_class = &showspectrum_class, .flags = AVFILTER_FLAG_SLICE_THREADS, };