From patchwork Mon Nov 30 12:49:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 24215 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 EB7A944915A for ; Mon, 30 Nov 2020 15:14:32 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B82106897E4; Mon, 30 Nov 2020 15:14:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f177.google.com (mail-lj1-f177.google.com [209.85.208.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E1FCE6897E3 for ; Mon, 30 Nov 2020 15:14:25 +0200 (EET) Received: by mail-lj1-f177.google.com with SMTP id j10so17850275lja.5 for ; Mon, 30 Nov 2020 05:14:25 -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=dIpBcsuwOeRy+8C+6RNfw8lFtNWLh4jy4/3uu/2iAWI=; b=XpH7DAdoyPuaocKZuDEOsctx/Rjkdk0JRaMHswKvgJ9pELUcMtuwhoCETxRdT6aHqh diCGeaGBoKnOZ6+r9xvPaIzqoyo4lGXIPteT7jVSSIjNWWeF0+WXASNpZLtHWevaoVhe JZ2dR2qW/jxC7L3IZqcSzOsV9AMSH+tJlY+hGFp2Wgh1xKrjf0kXXgx8Q2g5TpzQjtGa txlgjAvWjSuCEJryS/nIAbcAsPl8cg/0LvTiuhbiCdMlPzTFBWPYfWZ1wV9yj6XDUd1m 6AjVxDquHGBYBqxOUKa6tZH4JN93iKDBVkdFFF+j288oTqZOVmmkBzcB/9f0znNPwh6V jRDQ== 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=dIpBcsuwOeRy+8C+6RNfw8lFtNWLh4jy4/3uu/2iAWI=; b=nCmLM9rnDdwt6wMQ3Wj8i+cHuUvtJtTX6xyr3CekAQVhpSnWvXAlKRs65sFle/h9U4 Jaf0IKu3hzDufL5rxHbSJWHVCoByQ5lTw7dRmX2Om4CjjXLikQTqjXTh+QhRlP7xGu+o tu5EIaJPzPOZnzXNaPzaN2EPJjY0nqZy9bscgorQJKNItk401F/TVu8fkXWyL84cEKKU 7UgtKKhZSvvc7686B9lsdGZHXQ7AwB0JsWGJYInLCuZscs6xV8KKh8ay1pPWKRkGyNXc vpNBRgmC1+bMMKZ+4vKTqm7pt9Wd7O/34eeGsfxoIrGY0l/PiM9Xe2KstjNmoLb7F1X+ eYcw== X-Gm-Message-State: AOAM531ndvbCjQGpjAPoU8eZYy62qhMwlBc2L6KnEge4My8gmdFdwnN1 NAgUoCxU7JnYoAwNU/iNjP0m8N/4T0k= X-Google-Smtp-Source: ABdhPJxpjacLbNdpO2vH13FhfhFeaTtfhzzLMefe/XH8K8qjmaxiJO/KAHI1bHC3hNwpza8whlAJrg== X-Received: by 2002:a50:e786:: with SMTP id b6mr20726937edn.242.1606740556648; Mon, 30 Nov 2020 04:49:16 -0800 (PST) Received: from localhost.localdomain ([37.244.249.46]) by smtp.gmail.com with ESMTPSA id j10sm9230056edj.97.2020.11.30.04.49.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Nov 2020 04:49:15 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 Nov 2020 13:49:06 +0100 Message-Id: <20201130124906.31725-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avfilter: add asubcut 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 | 25 +++++++++++ libavfilter/Makefile | 1 + libavfilter/af_asupercut.c | 89 ++++++++++++++++++++++++++++++-------- libavfilter/allfilters.c | 1 + 4 files changed, 97 insertions(+), 19 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 06ed28f3f9..348cdae4e9 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -2636,6 +2636,28 @@ Default value is 20. This filter supports the all above options as @ref{commands}. +@section asubcut +Cut subwoofer frequencies. + +The filter accepts the following options: + +@table @option +@item cutoff +Set cutoff frequency in Hertz. Allowed range is 2 to 200. +Default value is 20. + +@item order +Set filter order. Available values are from 3 to 20. +Default value is 10. + +@item level +Set input gain level. Allowed range is from 0 to 1. Default value is 1. +@end table + +@subsection Commands + +This filter supports the all above options as @ref{commands}. + @section asupercut Cut super frequencies. @@ -2649,6 +2671,9 @@ Default value is 20000. @item order Set filter order. Available values are from 3 to 20. Default value is 10. + +@item level +Set input gain level. Allowed range is from 0 to 1. Default value is 1. @end table @subsection Commands diff --git a/libavfilter/Makefile b/libavfilter/Makefile index cff9402989..03998dc064 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -90,6 +90,7 @@ OBJS-$(CONFIG_ASR_FILTER) += af_asr.o OBJS-$(CONFIG_ASTATS_FILTER) += af_astats.o OBJS-$(CONFIG_ASTREAMSELECT_FILTER) += f_streamselect.o framesync.o OBJS-$(CONFIG_ASUBBOOST_FILTER) += af_asubboost.o +OBJS-$(CONFIG_ASUBCUT_FILTER) += af_asupercut.o OBJS-$(CONFIG_ASUPERCUT_FILTER) += af_asupercut.o OBJS-$(CONFIG_ATEMPO_FILTER) += af_atempo.o OBJS-$(CONFIG_ATRIM_FILTER) += trim.o diff --git a/libavfilter/af_asupercut.c b/libavfilter/af_asupercut.c index ef241405d8..6d0a2b79a9 100644 --- a/libavfilter/af_asupercut.c +++ b/libavfilter/af_asupercut.c @@ -32,6 +32,7 @@ typedef struct ASuperCutContext { const AVClass *class; double cutoff; + double level; int order; int filter_count; @@ -95,27 +96,52 @@ static int get_coeffs(AVFilterContext *ctx) s->filter_count = s->order / 2 + (s->order & 1); calc_q_factors(s->order, q); - if (s->order & 1) { - BiquadCoeffs *coeffs = &s->coeffs[0]; - double omega = 2. * tan(M_PI * w0); + if (!strcmp(ctx->filter->name, "asubcut")) { + if (s->order & 1) { + BiquadCoeffs *coeffs = &s->coeffs[0]; + double omega = 2. * tan(M_PI * w0); - coeffs->b0 = omega / (2. + omega); - coeffs->b1 = coeffs->b0; - coeffs->b2 = 0.; - coeffs->a1 = -(omega - 2.) / (2. + omega); - coeffs->a2 = 0.; - } + coeffs->b0 = 2. / (2. + omega); + coeffs->b1 = -coeffs->b0; + coeffs->b2 = 0.; + coeffs->a1 = -(omega - 2.) / (2. + omega); + coeffs->a2 = 0.; + } + + for (int b = (s->order & 1); b < s->filter_count; b++) { + BiquadCoeffs *coeffs = &s->coeffs[b]; + const int idx = b - (s->order & 1); + double norm = 1.0 / (1.0 + K / q[idx] + K * K); - for (int b = (s->order & 1); b < s->filter_count; b++) { - BiquadCoeffs *coeffs = &s->coeffs[b]; - const int idx = b - (s->order & 1); - double norm = 1.0 / (1.0 + K / q[idx] + K * K); + coeffs->b0 = norm; + coeffs->b1 = -2.0 * coeffs->b0; + coeffs->b2 = coeffs->b0; + coeffs->a1 = -2.0 * (K * K - 1.0) * norm; + coeffs->a2 = -(1.0 - K / q[idx] + K * K) * norm; + } + } else { + if (s->order & 1) { + BiquadCoeffs *coeffs = &s->coeffs[0]; + double omega = 2. * tan(M_PI * w0); + + coeffs->b0 = omega / (2. + omega); + coeffs->b1 = coeffs->b0; + coeffs->b2 = 0.; + coeffs->a1 = -(omega - 2.) / (2. + omega); + coeffs->a2 = 0.; + } - coeffs->b0 = K * K * norm; - coeffs->b1 = 2.0 * coeffs->b0; - coeffs->b2 = coeffs->b0; - coeffs->a1 = -2.0 * (K * K - 1.0) * norm; - coeffs->a2 = -(1.0 - K / q[idx] + K * K) * norm; + for (int b = (s->order & 1); b < s->filter_count; b++) { + BiquadCoeffs *coeffs = &s->coeffs[b]; + const int idx = b - (s->order & 1); + double norm = 1.0 / (1.0 + K / q[idx] + K * K); + + coeffs->b0 = K * K * norm; + coeffs->b1 = 2.0 * coeffs->b0; + coeffs->b2 = coeffs->b0; + coeffs->a1 = -2.0 * (K * K - 1.0) * norm; + coeffs->a2 = -(1.0 - K / q[idx] + K * K) * norm; + } } return 0; @@ -135,6 +161,7 @@ static int filter_channels_## name(AVFilterContext *ctx, void *arg, \ AVFrame *in = td->in; \ const int start = (in->channels * jobnr) / nb_jobs; \ const int end = (in->channels * (jobnr+1)) / nb_jobs; \ + const double level = s->level; \ \ for (int ch = start; ch < end; ch++) { \ const type *src = (const type *)in->extended_data[ch]; \ @@ -150,7 +177,7 @@ static int filter_channels_## name(AVFilterContext *ctx, void *arg, \ type *w = ((type *)s->w->extended_data[ch]) + b * 2; \ \ for (int n = 0; n < in->nb_samples; n++) { \ - type sin = b ? dst[n] : src[n]; \ + type sin = b ? dst[n] : src[n] * level; \ type sout = sin * b0 + w[0]; \ \ w[0] = b1 * sin + w[1] + a1 * sout; \ @@ -240,6 +267,7 @@ static av_cold void uninit(AVFilterContext *ctx) static const AVOption asupercut_options[] = { { "cutoff", "set cutoff frequency", OFFSET(cutoff), AV_OPT_TYPE_DOUBLE, {.dbl=20000}, 20000, 192000, FLAGS }, { "order", "set filter order", OFFSET(order), AV_OPT_TYPE_INT, {.i64=10}, 3, 20, FLAGS }, + { "level", "set input level", OFFSET(level), AV_OPT_TYPE_DOUBLE, {.dbl=1.}, 0., 1., FLAGS }, { NULL } }; @@ -276,3 +304,26 @@ AVFilter ff_af_asupercut = { .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, }; + +static const AVOption asubcut_options[] = { + { "cutoff", "set cutoff frequency", OFFSET(cutoff), AV_OPT_TYPE_DOUBLE, {.dbl=20}, 2, 200, FLAGS }, + { "order", "set filter order", OFFSET(order), AV_OPT_TYPE_INT, {.i64=10}, 3, 20, FLAGS }, + { "level", "set input level", OFFSET(level), AV_OPT_TYPE_DOUBLE, {.dbl=1.}, 0., 1., FLAGS }, + { NULL } +}; + +AVFILTER_DEFINE_CLASS(asubcut); + +AVFilter ff_af_asubcut = { + .name = "asubcut", + .description = NULL_IF_CONFIG_SMALL("Cut subwoofer frequencies."), + .query_formats = query_formats, + .priv_size = sizeof(ASuperCutContext), + .priv_class = &asubcut_class, + .uninit = uninit, + .inputs = inputs, + .outputs = outputs, + .process_command = process_command, + .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | + AVFILTER_FLAG_SLICE_THREADS, +}; diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 83f434bc27..d0fb7bfe9d 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -83,6 +83,7 @@ extern AVFilter ff_af_asr; extern AVFilter ff_af_astats; extern AVFilter ff_af_astreamselect; extern AVFilter ff_af_asubboost; +extern AVFilter ff_af_asubcut; extern AVFilter ff_af_asupercut; extern AVFilter ff_af_atempo; extern AVFilter ff_af_atrim;