From patchwork Tue Aug 24 20:02:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 29765 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3331207iov; Tue, 24 Aug 2021 13:03:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxfwzxGJHn1K689fDOsl2lUw+dDmgxHe2UaDnyRn7LvnCTEVdzTRixUuL2Ra8hBGzHG3cEN X-Received: by 2002:a17:906:150c:: with SMTP id b12mr42570101ejd.275.1629835400015; Tue, 24 Aug 2021 13:03:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629835400; cv=none; d=google.com; s=arc-20160816; b=tnhZIvernrWJ8Bl9a4QjJKTSuULbIsxs0ynhsEKfF5JGt5HJBUysUiCiGNXf8sCOHg spHfp2OrrcXjxCEovPJGFCHIZNBjU7POORzLSTdS0jqpOkvwTy7/MkUG9aag/+mQvF88 JwS8WyB1rd8zi5yAcK6HaHS+FB46tBFOvfiqtgYvmLd5WDBRXIsHfMBH9F6TN/b3WN5A YvyHXygot2fVuVu9oAqHndntlItWjg3dAZcgPiCTvn+Oe2/5mPwyaDit063Ezlidckkr JBpSKPSY7Evg0Qnlnc2I/S4I0uQCwEIhGvLldCfNEAlPFMsclqpRpUJsO4aDNE08mVmn iRKg== 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=W6QJp9wJUlDA62ojgofgJd8brlmdA97Xe6mYRHfExJM=; b=D5xmW+FzcRPm+J4EJJBXvBt7K5UXYlqZOxF07F7Vmb/Y9E1GRInM/GK/YYBDCGs+07 +LbinEzOhxhaHZOIlc34nuS+LFeIUPaFEyWHFwgWH49WklhMYU+0bWwuGvK+CIjjsSeN X6Hx3GpDmVXi0YFT0aiwTPoXcIxUnQtYV+eh+WiV5UIqRfqI40FL7ag7FBM85QR7TAQA CQ8XNZkZp8dAzBN8czNMoYEBFfFg6IzYbaRDu8Z7kdhPiodi8T7WmhAAbw22T/AiKbpc hqpe8OqaM9+Ug8CXnyTtlh/qoheMYK3ZsaRywExetghz5+I2mcwhNU5ygUV8rqm7KkC5 UEVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=cjQeHv9c; 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 qw32si1471273ejc.11.2021.08.24.13.02.56; Tue, 24 Aug 2021 13:03:20 -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=cjQeHv9c; 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 657786898A6; Tue, 24 Aug 2021 23:02:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D985468024D for ; Tue, 24 Aug 2021 23:02:45 +0300 (EEST) Received: by mail-ej1-f52.google.com with SMTP id n27so14766741eja.5 for ; Tue, 24 Aug 2021 13:02:45 -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=E4PZqxiXh54CgE6m47fiCYLQOLwXF1eKny30E8QmfxE=; b=cjQeHv9cl1tzA9Cps0jMHw+8QI78RjyzZJVmxU+vrJCS5yMaMCb/KRwi0wZ3wlzT0d xgBChA6WF9eWyZopxLnQshBPQBPzLJPDadx5ctlEL+jHlaeDUQhghRUHHdSYpfvhEgyJ P13NrGPxA6Yw6ltEi4fHn6+CyvQjhSELxfMpHERee9m+XoXSICvz6x2IDx+O7nEx9sZ8 R6isalxbFrJz9Y2XnUtLNen1rfPhQmt68FzFNAEHiYwHI2Gaq8gtHNU3SYq5b0VWSoYc G4LpYvDBOOd5xQJIIFmH3jRr/snGAJ4M0YQ4hGvwXzrEE6Fk9z5K/NoMcq1FShApFz3i f8Ug== 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=E4PZqxiXh54CgE6m47fiCYLQOLwXF1eKny30E8QmfxE=; b=QMM6o1BYJS1RKrV5EYGlenUGAIIoVwOV6JKaYBhLkrSrqAFFjYko0W60mh31x8oYdI z9xjw2kw3xMSrWY/JbX9Zy8bS03Q0eBEnRZpQ64KATvGQ3BSFblbaxmEes77LNdzAmEY UyYfgrnrR8puSsYzrSBgFSDgE26linUpuWdJQ3/SEN7QpeE16SoWsV9L72ZzhcoG3pXR Nai2HWneWVF1VHARFkPY1rIqBYXVeFH8r7895lsUMHnsS6B+Ljfe1RspDbQCeLvlQSLL rL51sCoGuyALqG4p9pUy5DSvck4vX90JTcPCeD/J3ukNqPH8XuafrqXKD6qas/8QoJ+L xg2Q== X-Gm-Message-State: AOAM531d3+f/QV3KhCHuneVqF9VA98ufny1LBJonAp41dVrdSVcMJG0L GvJbEcI/yh5lStVnECQE8A5LvVMuOQM= X-Received: by 2002:a17:906:27d5:: with SMTP id k21mr23625697ejc.235.1629835365214; Tue, 24 Aug 2021 13:02:45 -0700 (PDT) Received: from localhost.localdomain ([212.15.178.47]) by smtp.gmail.com with ESMTPSA id f12sm9904826ejz.99.2021.08.24.13.02.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Aug 2021 13:02:44 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Tue, 24 Aug 2021 22:02:36 +0200 Message-Id: <20210824200236.7304-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avfilter: add adecorrelate filter X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: dz2SpZdTdgT/ Signed-off-by: Paul B Mahol --- doc/filters.texi | 14 ++ libavfilter/Makefile | 1 + libavfilter/af_adecorrelate.c | 268 ++++++++++++++++++++++++++++++++++ libavfilter/allfilters.c | 1 + 4 files changed, 284 insertions(+) create mode 100644 libavfilter/af_adecorrelate.c diff --git a/doc/filters.texi b/doc/filters.texi index b902aca12d..66b86d4655 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -745,6 +745,20 @@ Select overlap-save method. Not interpolated samples remain unchanged. Default value is @code{a}. @end table +@section adecorrelate +Apply decorrelation to input audio stream. + +The filter accepts the following options: + +@table @option +@item stages +Set decorrelation stages of filtering. Allowed +range is from 1 to 16. Default value is 6. + +@item seed +Set random seed used for setting delay in samples across channels. +@end table + @section adelay Delay one or more audio channels. diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 102ce7beff..f71c59ba8b 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -40,6 +40,7 @@ OBJS-$(CONFIG_ACRUSHER_FILTER) += af_acrusher.o OBJS-$(CONFIG_ACUE_FILTER) += f_cue.o OBJS-$(CONFIG_ADECLICK_FILTER) += af_adeclick.o OBJS-$(CONFIG_ADECLIP_FILTER) += af_adeclick.o +OBJS-$(CONFIG_ADECORRELATE_FILTER) += af_adecorrelate.o OBJS-$(CONFIG_ADELAY_FILTER) += af_adelay.o OBJS-$(CONFIG_ADENORM_FILTER) += af_adenorm.o OBJS-$(CONFIG_ADERIVATIVE_FILTER) += af_aderivative.o diff --git a/libavfilter/af_adecorrelate.c b/libavfilter/af_adecorrelate.c new file mode 100644 index 0000000000..6113574125 --- /dev/null +++ b/libavfilter/af_adecorrelate.c @@ -0,0 +1,268 @@ +/* + * Copyright (c) 2013-2020 Michael Barbour + * Copyright (c) 2021 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/channel_layout.h" +#include "libavutil/ffmath.h" +#include "libavutil/lfg.h" +#include "libavutil/random_seed.h" +#include "libavutil/opt.h" +#include "avfilter.h" +#include "audio.h" +#include "formats.h" + +#define MAX_STAGES 16 +#define FILTER_FC 1100.0 +#define RT60_LF 0.1 +#define RT60_HF 0.008 + +typedef struct APContext { + int len, p; + double *mx, *my; + double b0, b1, a0, a1; +} APContext; + +typedef struct ADecorrelateContext { + const AVClass *class; + + int stages; + int64_t seed; + + int nb_channels; + APContext (*ap)[MAX_STAGES]; + + AVLFG c; + + void (*filter_channel)(AVFilterContext *ctx, + int channel, + AVFrame *in, AVFrame *out); +} ADecorrelateContext; + +static int query_formats(AVFilterContext *ctx) +{ + static const enum AVSampleFormat sample_fmts[] = { + AV_SAMPLE_FMT_DBLP, + AV_SAMPLE_FMT_NONE + }; + int ret = ff_set_common_formats_from_list(ctx, sample_fmts); + if (ret < 0) + return ret; + + ret = ff_set_common_all_channel_counts(ctx); + if (ret < 0) + return ret; + + return ff_set_common_all_samplerates(ctx); +} + +static int ap_init(APContext *ap, int fs, double delay) +{ + const int delay_samples = lrint(round(delay * fs)); + const double gain_lf = -60.0 / (RT60_LF * fs) * delay_samples; + const double gain_hf = -60.0 / (RT60_HF * fs) * delay_samples; + const double w0 = 2.0 * M_PI * FILTER_FC / fs; + const double t = tan(w0 / 2.0); + const double g_hf = ff_exp10(gain_hf / 20.0); + const double gd = ff_exp10((gain_lf-gain_hf) / 20.0); + const double sgd = sqrt(gd); + + ap->len = delay_samples + 1; + ap->p = 0; + ap->mx = av_calloc(ap->len, sizeof(*ap->mx)); + ap->my = av_calloc(ap->len, sizeof(*ap->my)); + if (!ap->mx || !ap->my) + return AVERROR(ENOMEM); + + ap->a0 = t + sgd; + ap->a1 = (t - sgd) / ap->a0; + ap->b0 = (gd*t - sgd) / ap->a0 * g_hf; + ap->b1 = (gd*t + sgd) / ap->a0 * g_hf; + ap->a0 = 1.0; + + return 0; +} + +static void ap_free(APContext *ap) +{ + av_freep(&ap->mx); + av_freep(&ap->my); +} + +static double ap_run(APContext *ap, double x) +{ + const int i0 = ((ap->p < 1) ? ap->len : ap->p)-1, i_n1 = ap->p, i_n2 = (ap->p+1 >= ap->len) ? 0 : ap->p+1; + const double r = ap->b1*x + ap->b0*ap->mx[i0] + ap->a1*ap->mx[i_n2] + ap->a0*ap->mx[i_n1] - + ap->a1*ap->my[i0] - ap->b0*ap->my[i_n2] - ap->b1*ap->my[i_n1]; + + ap->mx[ap->p] = x; + ap->my[ap->p] = r; + ap->p = (ap->p+1 >= ap->len) ? 0 : ap->p+1; + + return r; +} + +static void filter_channel_dbl(AVFilterContext *ctx, int ch, + AVFrame *in, AVFrame *out) +{ + ADecorrelateContext *s = ctx->priv; + const double *src = (const double *)in->extended_data[ch]; + double *dst = (double *)out->extended_data[ch]; + const int nb_samples = in->nb_samples; + const int stages = s->stages; + APContext *ap0 = &s->ap[ch][0]; + + for (int n = 0; n < nb_samples; n++) { + dst[n] = ap_run(ap0, src[n]); + for (int i = 1; i < stages; i++) { + APContext *ap = &s->ap[ch][i]; + + dst[n] = ap_run(ap, dst[n]); + } + } +} + +static int config_input(AVFilterLink *inlink) +{ + AVFilterContext *ctx = inlink->dst; + ADecorrelateContext *s = ctx->priv; + int ret; + + if (s->seed == -1) + s->seed = av_get_random_seed(); + av_lfg_init(&s->c, s->seed); + + s->nb_channels = inlink->channels; + s->ap = av_calloc(inlink->channels, sizeof(*s->ap)); + if (!s->ap) + return AVERROR(ENOMEM); + + for (int i = 0; i < inlink->channels; i++) { + for (int j = 0; j < s->stages; j++) { + ret = ap_init(&s->ap[i][j], inlink->sample_rate, + (double)av_lfg_get(&s->c) / 0xffffffff * 2.2917e-3 + 0.83333e-3); + if (ret < 0) + return ret; + } + } + + s->filter_channel = filter_channel_dbl; + + return 0; +} + +typedef struct ThreadData { + AVFrame *in, *out; +} ThreadData; + +static int filter_channels(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) +{ + ADecorrelateContext *s = ctx->priv; + ThreadData *td = arg; + AVFrame *out = td->out; + AVFrame *in = td->in; + const int start = (in->channels * jobnr) / nb_jobs; + const int end = (in->channels * (jobnr+1)) / nb_jobs; + + for (int ch = start; ch < end; ch++) + s->filter_channel(ctx, ch, in, out); + + return 0; +} + +static int filter_frame(AVFilterLink *inlink, AVFrame *in) +{ + AVFilterContext *ctx = inlink->dst; + AVFilterLink *outlink = ctx->outputs[0]; + AVFrame *out; + ThreadData td; + + 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); + } + + td.in = in; td.out = out; + ff_filter_execute(ctx, filter_channels, &td, NULL, + FFMIN(inlink->channels, ff_filter_get_nb_threads(ctx))); + + if (out != in) + av_frame_free(&in); + return ff_filter_frame(outlink, out); +} + +static av_cold void uninit(AVFilterContext *ctx) +{ + ADecorrelateContext *s = ctx->priv; + + if (s->ap) { + for (int ch = 0; ch < s->nb_channels; ch++) { + for (int stage = 0; stage < s->stages; stage++) + ap_free(&s->ap[ch][stage]); + } + } + + av_freep(&s->ap); +} + +#define OFFSET(x) offsetof(ADecorrelateContext, x) +#define FLAGS AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM + +static const AVOption adecorrelate_options[] = { + { "stages", "set filtering stages", OFFSET(stages), AV_OPT_TYPE_INT, {.i64=6}, 1, MAX_STAGES, FLAGS }, + { "seed", "set random seed", OFFSET(seed), AV_OPT_TYPE_INT64, {.i64=-1}, -1, UINT_MAX, FLAGS }, + { NULL } +}; + +AVFILTER_DEFINE_CLASS(adecorrelate); + +static const AVFilterPad inputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_AUDIO, + .filter_frame = filter_frame, + .config_props = config_input, + }, +}; + +static const AVFilterPad outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_AUDIO, + }, +}; + +const AVFilter ff_af_adecorrelate = { + .name = "adecorrelate", + .description = NULL_IF_CONFIG_SMALL("Apply decorrelation to input audio."), + .query_formats = query_formats, + .priv_size = sizeof(ADecorrelateContext), + .priv_class = &adecorrelate_class, + .uninit = uninit, + FILTER_INPUTS(inputs), + FILTER_OUTPUTS(outputs), + .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | + AVFILTER_FLAG_SLICE_THREADS, +}; diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 73040d2824..68bd3c432a 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -33,6 +33,7 @@ extern const AVFilter ff_af_acrossover; extern const AVFilter ff_af_acrusher; extern const AVFilter ff_af_adeclick; extern const AVFilter ff_af_adeclip; +extern const AVFilter ff_af_adecorrelate; extern const AVFilter ff_af_adelay; extern const AVFilter ff_af_adenorm; extern const AVFilter ff_af_aderivative;