From patchwork Wed Oct 3 16:17:18 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: 10622 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:ab0:73d2:0:0:0:0:0 with SMTP id m18csp4404733uaq; Wed, 3 Oct 2018 09:17:37 -0700 (PDT) X-Google-Smtp-Source: ACcGV60o42UVs1I4ypVfsUDzOyISdq4Mo3mrSSoZBGR9MtXITLF88sjg6K/bTGtdloWmq1p+IOsG X-Received: by 2002:a1c:7408:: with SMTP id p8-v6mr39215wmc.74.1538583457427; Wed, 03 Oct 2018 09:17:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538583457; cv=none; d=google.com; s=arc-20160816; b=IJ3Lp9DpCYwcVWjaI4AI8elQSrnFq1MPvknB45A5IVkGH5LKgit4+GoK/aCm6gQj9O aBscANWBFbGaCQNO3rt+rGzA5OeSSy5zALy8UnqrY5uqipCAuxGna5AQ4TXQY8e3ROMq +IjoqBBj1dNP2EAQtvUSqvlWqBbhtNXZn5Ks0Nmg6roRW61DxCP/H2ktGHPqlEGxJmCA gda9h7nqZILHlk/IxbF9e974ptYfswAekDQg7OgI6h/HPPEdjFsFxDcJerDiYss47llA szouJ5bRSjcwMyL+DK/b9iBnpP14HkuxDjKGfpgCIhe9vb1FfH90Se2iJMrFxFGyhpiB Ta0w== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=/gVlzrMC0VhEYW5f1l2qzHlFiYWYulNuybckVMyPT7M=; b=gI4iaFlQTXeYhH/AU7oCPEJ+fPNiI4PEjNiotX2gNl0zIjQhAXSSGqe7ElS5EfRJGi a+RwE1fZfYtHIiW07B3cOz01oZTmd+6tRGBB+qPm65KqB3oTTPdVCtygFbTnfWFC0iOu 8TsjFS3Xv17b3gprpP6Wsp2+0VM931bBOG6nNngihe5lQxZ7zSYLyUdbUdG6sgrbjq2D UOzxYH/gPEGDCpowRkUITOBq49NdM0qm3BRFaqnFeW/22tyTmiJ4jeh8SgyVBUxEp2bF qsOxg5YhnHcv9CebjFWf6nsvo+QWRiEdpCZ6DiMl3MGQ+J9oqffToW01vVQsnTnktTce M/PA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=nIFGzg54; 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 v3-v6si1496109wme.119.2018.10.03.09.17.36; Wed, 03 Oct 2018 09:17:37 -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=nIFGzg54; 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 1036568A43C; Wed, 3 Oct 2018 19:17:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0A43868A410 for ; Wed, 3 Oct 2018 19:17:09 +0300 (EEST) Received: by mail-ed1-f44.google.com with SMTP id g32-v6so5856805edg.13 for ; Wed, 03 Oct 2018 09:17:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=E3qHrNbWOo0Pkv/SWYsSClUetmjSRRlDirz1rude59c=; b=nIFGzg54qTgNaG+MzaUpkqIyUmYLsHSsi14/sKh+w62LzEXOGRlTPy53tjuNqlk1Zm D6wLMeuWMh5lwxkU5hjESsiGYKwmO3opQbH0+djWatEcmOb4tM4XaE2/zcKzs0UmuFqV o4hoNrTQICPKfqAJxz41j/7S4nam/fEvsbZKiC2tMCkX0WEl+kf1xiPr7LpAS/VfNlzP PODcLdCVRCPbvlqcu8PWK9O2WDE4nAqSvpniZ3lk54jStsPG780XcpGXZBwq5VAcNK9J tJSAI+maIBwNz0VaaWy29Y+OEY/IN+o1ns8MaLVQraWJ5GF3he2LZtxvGqCEqLQZloO9 JHwg== 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:in-reply-to :references; bh=E3qHrNbWOo0Pkv/SWYsSClUetmjSRRlDirz1rude59c=; b=pxUCUAv6woS3ogBc7PozWldMSMZKXiwlZbqHrdfEFIiMPcOEvUOKIY+dtdmo0E7Qu2 SeOYAucy8mcTe5duldvADtnJlKzzlsLqjSx3vyJLttJNubpeAIhisd4ehQo01P6otl9O r49jyeYyB3WXomiD2x/y6UJeV/w7QNGm+Mi6ZqTnzqflXwVjHHxv0ANrBtGAKtQTpxRV tteEgMGFPjWMS4MGLAARpJJ2mCTmFeLifJGagBhSWvg06uMMkVkm0QSMwU4pyKqDljWj qGJP7MqG0zj9NEo3einRJGWPtxskdFCBfEcRB1QPgrAp7kNbN681rtkpOOhP+7VBxpiM ZlEQ== X-Gm-Message-State: ABuFfoiox8N49c+wRr+BhsIjdkJgh31Z83821uxRmkeoxACdyc6vTbDL ZF61dwhZAhy1RqIxt6vLdfduorYH X-Received: by 2002:a50:92b1:: with SMTP id k46-v6mr3455142eda.180.1538583447992; Wed, 03 Oct 2018 09:17:27 -0700 (PDT) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id p6-v6sm628140edr.48.2018.10.03.09.17.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Oct 2018 09:17:27 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 3 Oct 2018 18:17:18 +0200 Message-Id: <20181003161718.5898-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181003110347.22904-2-onemda@gmail.com> References: <20181003110347.22904-2-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/4] avfilter/af_asetnsamples: use lavfi internal queue 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/af_asetnsamples.c | 146 ++++++++-------------------------- 1 file changed, 32 insertions(+), 114 deletions(-) diff --git a/libavfilter/af_asetnsamples.c b/libavfilter/af_asetnsamples.c index ecb76e64db..30fabede26 100644 --- a/libavfilter/af_asetnsamples.c +++ b/libavfilter/af_asetnsamples.c @@ -24,20 +24,18 @@ * Filter that changes number of samples on single output operation */ -#include "libavutil/audio_fifo.h" #include "libavutil/avassert.h" #include "libavutil/channel_layout.h" #include "libavutil/opt.h" #include "avfilter.h" #include "audio.h" +#include "filters.h" #include "internal.h" #include "formats.h" typedef struct ASNSContext { const AVClass *class; int nb_out_samples; ///< how many samples to output - AVAudioFifo *fifo; ///< samples are queued here - int64_t next_out_pts; int pad; } ASNSContext; @@ -54,134 +52,55 @@ static const AVOption asetnsamples_options[] = { AVFILTER_DEFINE_CLASS(asetnsamples); -static av_cold int init(AVFilterContext *ctx) +static int activate(AVFilterContext *ctx) { - ASNSContext *asns = ctx->priv; - - asns->next_out_pts = AV_NOPTS_VALUE; - av_log(ctx, AV_LOG_VERBOSE, "nb_out_samples:%d pad:%d\n", asns->nb_out_samples, asns->pad); - - return 0; -} - -static av_cold void uninit(AVFilterContext *ctx) -{ - ASNSContext *asns = ctx->priv; - av_audio_fifo_free(asns->fifo); -} - -static int config_props_output(AVFilterLink *outlink) -{ - ASNSContext *asns = outlink->src->priv; - - asns->fifo = av_audio_fifo_alloc(outlink->format, outlink->channels, asns->nb_out_samples); - if (!asns->fifo) - return AVERROR(ENOMEM); - - return 0; -} - -static int push_samples(AVFilterLink *outlink) -{ - ASNSContext *asns = outlink->src->priv; - AVFrame *outsamples = NULL; - int ret, nb_out_samples, nb_pad_samples; - - if (asns->pad) { - nb_out_samples = av_audio_fifo_size(asns->fifo) ? asns->nb_out_samples : 0; - nb_pad_samples = nb_out_samples - FFMIN(nb_out_samples, av_audio_fifo_size(asns->fifo)); - } else { - nb_out_samples = FFMIN(asns->nb_out_samples, av_audio_fifo_size(asns->fifo)); - nb_pad_samples = 0; - } - - if (!nb_out_samples) - return 0; - - outsamples = ff_get_audio_buffer(outlink, nb_out_samples); - if (!outsamples) - return AVERROR(ENOMEM); - - av_audio_fifo_read(asns->fifo, - (void **)outsamples->extended_data, nb_out_samples); - - if (nb_pad_samples) - av_samples_set_silence(outsamples->extended_data, nb_out_samples - nb_pad_samples, - nb_pad_samples, outlink->channels, - outlink->format); - outsamples->nb_samples = nb_out_samples; - outsamples->channel_layout = outlink->channel_layout; - outsamples->sample_rate = outlink->sample_rate; - outsamples->pts = asns->next_out_pts; - - if (asns->next_out_pts != AV_NOPTS_VALUE) - asns->next_out_pts += av_rescale_q(nb_out_samples, (AVRational){1, outlink->sample_rate}, outlink->time_base); - - ret = ff_filter_frame(outlink, outsamples); - if (ret < 0) - return ret; - return nb_out_samples; -} - -static int filter_frame(AVFilterLink *inlink, AVFrame *insamples) -{ - AVFilterContext *ctx = inlink->dst; - ASNSContext *asns = ctx->priv; + AVFilterLink *inlink = ctx->inputs[0]; AVFilterLink *outlink = ctx->outputs[0]; + ASNSContext *s = ctx->priv; + AVFrame *frame = NULL, *pad_frame; int ret; - int nb_samples = insamples->nb_samples; - - if (av_audio_fifo_space(asns->fifo) < nb_samples) { - av_log(ctx, AV_LOG_DEBUG, "No space for %d samples, stretching audio fifo\n", nb_samples); - ret = av_audio_fifo_realloc(asns->fifo, av_audio_fifo_size(asns->fifo) + nb_samples); - if (ret < 0) { - av_log(ctx, AV_LOG_ERROR, - "Stretching audio fifo failed, discarded %d samples\n", nb_samples); - return -1; - } - } - ret = av_audio_fifo_write(asns->fifo, (void **)insamples->extended_data, nb_samples); - if (ret > 0 && asns->next_out_pts == AV_NOPTS_VALUE) - asns->next_out_pts = insamples->pts; - av_frame_free(&insamples); + FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink); + + ret = ff_inlink_consume_samples(inlink, s->nb_out_samples, s->nb_out_samples, &frame); if (ret < 0) return ret; - while (av_audio_fifo_size(asns->fifo) >= asns->nb_out_samples) - push_samples(outlink); - return 0; -} - -static int request_frame(AVFilterLink *outlink) -{ - AVFilterLink *inlink = outlink->src->inputs[0]; - int ret; - - ret = ff_request_frame(inlink); - if (ret == AVERROR_EOF) { - ret = push_samples(outlink); - return ret < 0 ? ret : ret > 0 ? 0 : AVERROR_EOF; + if (ret > 0) { + if ((!s->pad || (s->pad && frame->nb_samples == s->nb_out_samples))) + return ff_filter_frame(outlink, frame); + + pad_frame = ff_get_audio_buffer(outlink, s->nb_out_samples); + if (!pad_frame) + return AVERROR(ENOMEM); + + av_samples_copy(pad_frame->extended_data, frame->extended_data, + 0, 0, frame->nb_samples, frame->channels, frame->format); + av_samples_set_silence(pad_frame->extended_data, frame->nb_samples, + s->nb_out_samples - frame->nb_samples, frame->channels, + frame->format); + av_frame_free(&frame); + return ff_filter_frame(outlink, pad_frame); } - return ret; + FF_FILTER_FORWARD_STATUS(inlink, outlink); + FF_FILTER_FORWARD_WANTED(outlink, inlink); + + return FFERROR_NOT_READY; } static const AVFilterPad asetnsamples_inputs[] = { { - .name = "default", - .type = AVMEDIA_TYPE_AUDIO, - .filter_frame = filter_frame, + .name = "default", + .type = AVMEDIA_TYPE_AUDIO, }, { NULL } }; static const AVFilterPad asetnsamples_outputs[] = { { - .name = "default", - .type = AVMEDIA_TYPE_AUDIO, - .request_frame = request_frame, - .config_props = config_props_output, + .name = "default", + .type = AVMEDIA_TYPE_AUDIO, }, { NULL } }; @@ -191,8 +110,7 @@ AVFilter ff_af_asetnsamples = { .description = NULL_IF_CONFIG_SMALL("Set the number of samples for each output audio frames."), .priv_size = sizeof(ASNSContext), .priv_class = &asetnsamples_class, - .init = init, - .uninit = uninit, .inputs = asetnsamples_inputs, .outputs = asetnsamples_outputs, + .activate = activate, };