From patchwork Tue Jan 2 16:18:14 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: 7080 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp14866431jad; Tue, 2 Jan 2018 08:18:34 -0800 (PST) X-Google-Smtp-Source: ACJfBovMsLjob9gqxVscBNzQcGjEoM1pMB++kWQBr5MFHKIbDxkFqBi727DiIdvTL3ppBhJfcVPj X-Received: by 10.28.158.212 with SMTP id h203mr16723333wme.157.1514909914346; Tue, 02 Jan 2018 08:18:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514909914; cv=none; d=google.com; s=arc-20160816; b=uV0HqqHhm4/3RVe5PlbBQvDEVw4qz5aOdoA0tVhZhWRTORh+UdN6YFbqtF2Yeo2gXX CiZ1dIJ1utv+soWj8xB0WDpOwCIsLDXKr9IhprzuZLUu4ZaHi/RrNhrdCBqiSidIzJZM Bii/zxkEMbdKKkebNQhuoE2Lw6LJExGyVQqdqCfZc1kPYnc/9wqn+s0zQnY4S7JcKfso zPhJwFTUMMCRnPVHMbVIC8eJom5NC4kNarGzEE/U26F7ucf3GB3RulOeAVccoMBLM5Nl tErw/xnMSv9zrO2ud6qHQSepGnyft2dgrOvFO7hFtsKDa8iC85sz2n8Xqt9tamggl/LC DgHg== 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:arc-authentication-results; bh=3nKH9zb4uC5MMDZESByYKH3RIk1XP3TQUY8BYCg2XAY=; b=IE6ZFaR3lfCun147bio6krS80kUjqkBcEnX7Zf4LfiTWmtKPtgIgFy3t5CxUwOsx7O sgtw1IxnxZFACZ4I5ih296neOoLiedQufMoB4pfnIoe6rQN95cJGyyHRC0cZCuXupJlG QzVxTRGeOE+VM4GhCxlfS6G1zMYCB+0OjxIkOUCneuAjIxRPRTXQ36Xv1ChI0BweD2n0 oqPvCpRFq/K02MrRYpcEcJkL/fDSJMNeVMTG5ik2qOxygLDs9hRx0dzA1/JPNBNl/Ax8 estqZti5fWm5q/01vqGeiwzRPyQbCSN99YXmGJQvTRwpUa6M5+94tuWr5e+drU63nKwR KhTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=u22tig4g; 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=NONE 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 t7si22081773wmd.261.2018.01.02.08.18.33; Tue, 02 Jan 2018 08:18:34 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=u22tig4g; 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=NONE 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 4A12568829B; Tue, 2 Jan 2018 18:18:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f170.google.com (mail-wr0-f170.google.com [209.85.128.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 997EA68044D for ; Tue, 2 Jan 2018 18:18:10 +0200 (EET) Received: by mail-wr0-f170.google.com with SMTP id o101so20342031wrb.6 for ; Tue, 02 Jan 2018 08:18:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=ks+U67DcyGUQL7Zb+0YwzEEORzKvSVL/4riMimhb1O0=; b=u22tig4ggpLDRJEXhozTQnt6wWsS2YlSfA8EIzpll1YN1thdZkmJ0v+Mn2gToXxFWK JuPAFaV41Rv1Ez4zFGAQCd7R70SfItfPN6u2mWKee6HUg6XgMxHJDr5GuJbBbylDtuvu r2vqQMR4cZPjbeTTn2526NC9dhFRxjRq7xye/j2eiFD7QC9Mr1GZsMi+p8ROP6EE9QuQ XBNqkSn9dD/PnG6RwQa7ujGBC0HSRMfobpzLM9zJR1R3v3v1JqYQV9mQB1ygcWlzlBwB ylSYF9SPdWFbM9P4+e1uwLbE2hpxW50S6qU5WLgAkmQnHHbJcy7AQAHMbHylGGaY/hrb 5mLg== 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=ks+U67DcyGUQL7Zb+0YwzEEORzKvSVL/4riMimhb1O0=; b=QLfu63T8UFjO7a2PQErKvaxQ0rkuiJ8wMY8WjblwpqkLYLzP4DrZC/vmPX5vTavV1y ZuHv20VRzYvk30iQ8LieW2WEZBCGhJgttK5FyIZo3WtBDsbxCbrtYZkCNnoyUHihj952 Q+kkXasS8Qijyu89HTySJ8+yW+ZDR2DWbzynJGSEvAF7wBTX5vQ6xIpyAnb/w+VyXm4z 9jKb1h7Vd+WmdIqPdjpBxJZ7xTjwkxUFyc7c6Q8FkPj1FTyPzpPA11QzjBJkzheo8+G3 oqj+8cL+PCoi+07MwSBbRuhYBfTmCZJF2Nv7iypKUBpL2CrbS2fNR8F4jExkU0MwEj6u LovQ== X-Gm-Message-State: AKGB3mKSYAo9a/WXEuMPYtglJ5itheH2DhMFF49f20MkygZp+7QNlBbA WnFwdWCVcvhzmaMCaCTaKYr6qQ== X-Received: by 10.223.174.174 with SMTP id y43mr43674998wrc.196.1514909906086; Tue, 02 Jan 2018 08:18:26 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id y72sm54181696wrb.85.2018.01.02.08.18.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jan 2018 08:18:25 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Jan 2018 17:18:14 +0100 Message-Id: <20180102161814.24700-1-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 Subject: [FFmpeg-devel] [PATCH] avfilter: add arbitrary audio IIR 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 --- doc/filters.texi | 14 +++ libavfilter/Makefile | 1 + libavfilter/af_aiir.c | 232 +++++++++++++++++++++++++++++++++++++++++++++++ libavfilter/allfilters.c | 1 + 4 files changed, 248 insertions(+) create mode 100644 libavfilter/af_aiir.c diff --git a/doc/filters.texi b/doc/filters.texi index f651f1234d..ff911ad92e 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -1059,6 +1059,20 @@ the reduction. Default is @code{average}. Can be @code{average} or @code{maximum}. @end table +@section aiir + +Apply an arbitrary Infinite Impulse Response filter. + +It accepts the following parameters: + +@table @option +@item a +Set denominator coefficients. + +@item b +Set nominator coefficients. +@end table + @section alimiter The limiter prevents an input signal from rising over a desired threshold. diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 8bde542163..1fe58ed3d2 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -43,6 +43,7 @@ OBJS-$(CONFIG_AFFTFILT_FILTER) += af_afftfilt.o OBJS-$(CONFIG_AFIR_FILTER) += af_afir.o OBJS-$(CONFIG_AFORMAT_FILTER) += af_aformat.o OBJS-$(CONFIG_AGATE_FILTER) += af_agate.o +OBJS-$(CONFIG_AIIR_FILTER) += af_aiir.o OBJS-$(CONFIG_AINTERLEAVE_FILTER) += f_interleave.o OBJS-$(CONFIG_ALIMITER_FILTER) += af_alimiter.o OBJS-$(CONFIG_ALLPASS_FILTER) += af_biquads.o diff --git a/libavfilter/af_aiir.c b/libavfilter/af_aiir.c new file mode 100644 index 0000000000..d1be9afa5e --- /dev/null +++ b/libavfilter/af_aiir.c @@ -0,0 +1,232 @@ +/* + * Copyright (c) 2018 Paul B Mahol + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "libavutil/avassert.h" +#include "libavutil/avstring.h" +#include "libavutil/opt.h" +#include "audio.h" +#include "avfilter.h" +#include "internal.h" + +typedef struct AudioIIRContext { + const AVClass *class; + char *a_str, *b_str; + + int nb_a, nb_b; + double *a, *b; + AVFrame *input, *output; +} AudioIIRContext; + +static int query_formats(AVFilterContext *ctx) +{ + AVFilterFormats *formats; + AVFilterChannelLayouts *layouts; + static const enum AVSampleFormat sample_fmts[] = { + AV_SAMPLE_FMT_DBLP, + AV_SAMPLE_FMT_NONE + }; + int ret; + + layouts = ff_all_channel_counts(); + if (!layouts) + return AVERROR(ENOMEM); + ret = ff_set_common_channel_layouts(ctx, layouts); + if (ret < 0) + return ret; + + formats = ff_make_format_list(sample_fmts); + if (!formats) + return AVERROR(ENOMEM); + ret = ff_set_common_formats(ctx, formats); + if (ret < 0) + return ret; + + formats = ff_all_samplerates(); + if (!formats) + return AVERROR(ENOMEM); + return ff_set_common_samplerates(ctx, formats); +} + +static int config_output(AVFilterLink *outlink) +{ + AVFilterContext *ctx = outlink->src; + AudioIIRContext *s = ctx->priv; + AVFilterLink *inlink = ctx->inputs[0]; + + s->input = ff_get_audio_buffer(inlink, s->nb_b); + s->output = ff_get_audio_buffer(inlink, s->nb_a); + if (!s->input || !s->output) + return AVERROR(ENOMEM); + return 0; +} + +static int filter_frame(AVFilterLink *inlink, AVFrame *in) +{ + AVFilterContext *ctx = inlink->dst; + AudioIIRContext *s = ctx->priv; + AVFilterLink *outlink = ctx->outputs[0]; + AVFrame *out; + int ch, n; + + if (av_frame_is_writable(in)) { + out = in; + } else { + out = ff_get_audio_buffer(outlink, in->nb_samples); + if (!out) { + av_frame_free(&in); + return AVERROR(ENOMEM); + } + av_frame_copy_props(out, in); + } + + for (ch = 0; ch < out->channels; ch++) { + const double *src = (const double *)in->extended_data[ch]; + double *ic = (double *)s->input->extended_data[ch]; + double *oc = (double *)s->output->extended_data[ch]; + double *dst = (double *)out->extended_data[ch]; + const double *a = s->a; + const double *b = s->b; + + for (n = 0; n < in->nb_samples; n++) { + double sample = 0.; + int x; + + memmove(&ic[1], &ic[0], (s->nb_b - 1) * sizeof(*ic)); + memmove(&oc[1], &oc[0], (s->nb_a - 1) * sizeof(*oc)); + ic[0] = src[n]; + for (x = 0; x < s->nb_b; x++) + sample += b[x] * ic[x]; + + for (x = 1; x < s->nb_a; x++) + sample -= a[x] * oc[x]; + + oc[0] = dst[n] = sample; + } + } + + if (in != out) + av_frame_free(&in); + + return ff_filter_frame(outlink, out); +} + +static void count_items(char *item_str, int *nb_items) +{ + char *p; + + *nb_items = 1; + for (p = item_str; *p; p++) { + if (*p == ' ' || *p == '|') + (*nb_items)++; + } +} + +static int read_items(char *item_str, int nb_items, double *dst) +{ + char *p, *arg, *saveptr = NULL; + int i; + + p = item_str; + for (i = 0; i < nb_items; i++) { + if (!(arg = av_strtok(p, " |", &saveptr))) + break; + + p = NULL; + sscanf(arg, "%lf", &dst[i]); + } + + return 0; +} + +static av_cold int init(AVFilterContext *ctx) +{ + AudioIIRContext *s = ctx->priv; + int i; + + count_items(s->a_str, &s->nb_a); + count_items(s->b_str, &s->nb_b); + + s->a = av_calloc(s->nb_a, sizeof(*s->a)); + s->b = av_calloc(s->nb_b, sizeof(*s->b)); + if (!s->a || !s->b) + return AVERROR(ENOMEM); + + read_items(s->a_str, s->nb_a, s->a); + read_items(s->b_str, s->nb_b, s->b); + + for (i = 1; i < s->nb_a; i++) + s->a[i] /= s->a[0]; + + for (i = 0; i < s->nb_b; i++) + s->b[i] /= s->a[0]; + + return 0; +} + +static av_cold void uninit(AVFilterContext *ctx) +{ + AudioIIRContext *s = ctx->priv; + + av_freep(&s->a); + av_freep(&s->b); + av_frame_free(&s->input); + av_frame_free(&s->output); +} + +static const AVFilterPad inputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_AUDIO, + .filter_frame = filter_frame, + }, + { NULL } +}; + +static const AVFilterPad outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_AUDIO, + .config_props = config_output, + }, + { NULL } +}; + +#define OFFSET(x) offsetof(AudioIIRContext, x) +#define FLAGS AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM + +static const AVOption aiir_options[] = { + { "a", "set A coefficients", OFFSET(a_str), AV_OPT_TYPE_STRING, {.str="1 1"}, 0, 0, .flags = FLAGS }, + { "b", "set B coefficients", OFFSET(b_str), AV_OPT_TYPE_STRING, {.str="1 1"}, 0, 0, .flags = FLAGS }, + { NULL }, +}; + +AVFILTER_DEFINE_CLASS(aiir); + +AVFilter ff_af_aiir = { + .name = "aiir", + .description = NULL_IF_CONFIG_SMALL("Apply Infinite Impulse Response filter with supplied coefficients."), + .priv_size = sizeof(AudioIIRContext), + .init = init, + .uninit = uninit, + .query_formats = query_formats, + .inputs = inputs, + .outputs = outputs, + .priv_class = &aiir_class, +}; diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 67c073091f..705c03c22c 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -54,6 +54,7 @@ static void register_all(void) REGISTER_FILTER(AFIR, afir, af); REGISTER_FILTER(AFORMAT, aformat, af); REGISTER_FILTER(AGATE, agate, af); + REGISTER_FILTER(AIIR, aiir, af); REGISTER_FILTER(AINTERLEAVE, ainterleave, af); REGISTER_FILTER(ALIMITER, alimiter, af); REGISTER_FILTER(ALLPASS, allpass, af);