From patchwork Tue Apr 16 19:23:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 12771 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 20A3D448F5B for ; Tue, 16 Apr 2019 22:24:21 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F01E6680B13; Tue, 16 Apr 2019 22:24:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D77266809B6 for ; Tue, 16 Apr 2019 22:24:14 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id v14so469226wmf.2 for ; Tue, 16 Apr 2019 12:24:14 -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=B7RyMmr53kfNgGtKCGNmMXP1GBJtAueo/vpF5Evhpn0=; b=qna3tojqJidSvO+xRz4v/e8AapIBZXu/Op+FLNwNpPMMtQYRnB1lyXS8quRosBmUCH f0kAV8zeL6c9fV8fcwdZpW/LEhHZnfm2u2ZsKMq0bGq1OJeF3o2T+uaQVFJFIKpsUuBv YRzxtMQjfgFNxr/YnU6VOnci4WGDMCKEV0C5lcPkVBWtHTXmvIYIrsufH1f2btMIU+E5 0BEpGfy2bkkO75FnfU10MOuthsZjhFth9OgspwT+LnTPGLe8I5LZbLPPB4Aocx+I8sM1 dxKBnctsuQC5adchM+2trxNgec3M9kyG21I077MPuAa8T1Yb+gvLFG4xulumVkoA9Ges vM7w== 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=B7RyMmr53kfNgGtKCGNmMXP1GBJtAueo/vpF5Evhpn0=; b=ovcmHJr5ZHEtLc3syNOwGX0VLpIV0B3qphKX/Ej2KmSFIgEcGobC2G4HQ02oCpmaav cQwR5pndsqLpU01omCmxQCGvWeSJlhkdCsVqHGnGBkyA4iCn3e0/aXmdNvQjRLIbuM8D DrIV+nQ041JgB6kwin2plsxvcWJVrZlH9hBdt+H91kKESI/27mJXFcAKN+XyUjzJfiwK NHHo1Fmo3ri6VZLucYOAPaFEIrWvI9FM+3txa7odCyk849QInq6Cr99JlEy9SUqskple Zj2aP/+2IYV4jVcaFrgn2gZYYvk75iplfFiARfvvxLIurnNRNal8McmZeuuMG1E2HM4C 4vmg== X-Gm-Message-State: APjAAAXH0HX7riw6pqQ7NZCjnY58TZwdHDUeeehLrQXr8GLVSmMNQp15 IRS8+SfSIfB2FYxt5//iKCMMJ1OD X-Google-Smtp-Source: APXvYqzxi3uPBnchmIFfh1caZKT8QrTKkhi5ODdwzFq4NLueTVz11GUIRZ9PSuGbXtYDI9BsUznURw== X-Received: by 2002:a1c:be0e:: with SMTP id o14mr27945100wmf.118.1555442653981; Tue, 16 Apr 2019 12:24:13 -0700 (PDT) Received: from localhost.localdomain ([37.244.238.255]) by smtp.gmail.com with ESMTPSA id s21sm26357427wra.45.2019.04.16.12.24.12 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Apr 2019 12:24:13 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Tue, 16 Apr 2019 21:23:58 +0200 Message-Id: <20190416192358.10585-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avfilter: add audio soft clip 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 | 22 ++++ libavfilter/Makefile | 1 + libavfilter/af_asoftclip.c | 206 +++++++++++++++++++++++++++++++++++++ libavfilter/allfilters.c | 1 + 4 files changed, 230 insertions(+) create mode 100644 libavfilter/af_asoftclip.c diff --git a/doc/filters.texi b/doc/filters.texi index 867607d870..404096e478 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -2093,6 +2093,28 @@ audio, the data is treated as if all the planes were concatenated. A list of Adler-32 checksums for each data plane. @end table +@section asoftclip + +Apply audio soft clipping. + +This filter accepts the following options: + +@table @option +@item type +Set type of soft-clipping. + +It accepts the following values: +@table @option +@item tanh +@item sin +@item bdj +@item atan +@end table + +@item clip +Set clipping limit value. Default is 1. Allowed range is @code{[0.01 - 1]}. +@end table + @anchor{astats} @section astats diff --git a/libavfilter/Makefile b/libavfilter/Makefile index fef6ec5c55..682df45ef5 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -80,6 +80,7 @@ OBJS-$(CONFIG_ASETRATE_FILTER) += af_asetrate.o OBJS-$(CONFIG_ASETTB_FILTER) += settb.o OBJS-$(CONFIG_ASHOWINFO_FILTER) += af_ashowinfo.o OBJS-$(CONFIG_ASIDEDATA_FILTER) += f_sidedata.o +OBJS-$(CONFIG_ASOFTCLIP_FILTER) += af_asoftclip.o OBJS-$(CONFIG_ASPLIT_FILTER) += split.o OBJS-$(CONFIG_ASTATS_FILTER) += af_astats.o OBJS-$(CONFIG_ASTREAMSELECT_FILTER) += f_streamselect.o framesync.o diff --git a/libavfilter/af_asoftclip.c b/libavfilter/af_asoftclip.c new file mode 100644 index 0000000000..ee2a0f0562 --- /dev/null +++ b/libavfilter/af_asoftclip.c @@ -0,0 +1,206 @@ +/* + * Copyright (c) 2019 The FFmpeg Project + * + * 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/opt.h" +#include "avfilter.h" +#include "audio.h" +#include "formats.h" + +enum ASoftClipTypes { + ASC_TANH, + ASC_SIN, + ASC_BDJ, + ASC_ATAN, + NB_TYPES, +}; + +typedef struct ASoftClipContext { + const AVClass *class; + + int type; + double clip; + + void (*filter)(struct ASoftClipContext *s, void **dst, const void **src, + int nb_samples, int channels); +} ASoftClipContext; + +#define OFFSET(x) offsetof(ASoftClipContext, x) +#define A AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM + +static const AVOption asoftclip_options[] = { + { "type", "set softclip type", OFFSET(type), AV_OPT_TYPE_INT, {.i64=0}, 0, NB_TYPES-1, A, "types" }, + { "tanh", NULL, 0, AV_OPT_TYPE_CONST, {.i64=ASC_TANH}, 0, 0, A, "types" }, + { "sin", NULL, 0, AV_OPT_TYPE_CONST, {.i64=ASC_SIN}, 0, 0, A, "types" }, + { "bdj", NULL, 0, AV_OPT_TYPE_CONST, {.i64=ASC_BDJ}, 0, 0, A, "types" }, + { "atan", NULL, 0, AV_OPT_TYPE_CONST, {.i64=ASC_ATAN}, 0, 0, A, "types" }, + { "clip", "set softclip clip", OFFSET(clip), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0.01, 1, A }, + { NULL } +}; + +AVFILTER_DEFINE_CLASS(asoftclip); + +static int query_formats(AVFilterContext *ctx) +{ + AVFilterFormats *formats = NULL; + AVFilterChannelLayouts *layouts = NULL; + static const enum AVSampleFormat sample_fmts[] = { + AV_SAMPLE_FMT_DBLP, + AV_SAMPLE_FMT_NONE + }; + int 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; + + 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_all_samplerates(); + return ff_set_common_samplerates(ctx, formats); +} + +#define SQR(x) ((x) * (x)) + +static void filter_dblp(ASoftClipContext *s, + void **dptr, const void **sptr, + int nb_samples, int channels) +{ + double clip = s->clip; + int n, c; + + for (c = 0; c < channels; c++) { + const double *src = sptr[c]; + double *dst = dptr[c]; + + switch (s->type) { + case ASC_TANH: + for (n = 0; n < nb_samples; n++) { + double current = src[n]; + double aclip = av_clipd(current, -clip, clip); + double sclip = current - aclip; + + dst[n] = aclip + tanh(sclip / clip) * clip; + } + break; + case ASC_SIN: + for (n = 0; n < nb_samples; n++) { + double current = src[n]; + double aclip = av_clipd(current, -clip, clip); + double sclip = current - aclip; + + dst[n] = aclip + sin(sclip * M_PI_2) * clip; + } + break; + case ASC_BDJ: + for (n = 0; n < nb_samples; n++) { + double current = src[n]; + double aclip = av_clipd(current, -clip, clip); + double sclip = current - aclip; + + dst[n] = aclip + (sclip / (1. + SQR(sclip / clip))); + } + break; + case ASC_ATAN: + for (n = 0; n < nb_samples; n++) { + double current = src[n]; + double aclip = av_clipd(current, -clip, clip); + double sclip = current - aclip; + + dst[n] = aclip + 2. / M_PI * atan(sclip / 5.); + } + break; + } + } +} + +static int config_input(AVFilterLink *inlink) +{ + AVFilterContext *ctx = inlink->dst; + ASoftClipContext *s = ctx->priv; + + s->filter = filter_dblp; + + return 0; +} + +static int filter_frame(AVFilterLink *inlink, AVFrame *in) +{ + AVFilterContext *ctx = inlink->dst; + AVFilterLink *outlink = ctx->outputs[0]; + ASoftClipContext *s = ctx->priv; + AVFrame *out; + + 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); + } + + s->filter(s, (void **)out->extended_data, (const void **)in->extended_data, + in->nb_samples, in->channels); + + if (out != in) + av_frame_free(&in); + + return ff_filter_frame(outlink, out); +} + +static const AVFilterPad inputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_AUDIO, + .filter_frame = filter_frame, + .config_props = config_input, + }, + { NULL } +}; + +static const AVFilterPad outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_AUDIO, + }, + { NULL } +}; + +AVFilter ff_af_asoftclip = { + .name = "asoftclip", + .description = NULL_IF_CONFIG_SMALL("Audio Soft Clipper."), + .query_formats = query_formats, + .priv_size = sizeof(ASoftClipContext), + .priv_class = &asoftclip_class, + .inputs = inputs, + .outputs = outputs, +}; diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index c51ae0f3c7..4d3039d6ba 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -72,6 +72,7 @@ extern AVFilter ff_af_asetrate; extern AVFilter ff_af_asettb; extern AVFilter ff_af_ashowinfo; extern AVFilter ff_af_asidedata; +extern AVFilter ff_af_asoftclip; extern AVFilter ff_af_asplit; extern AVFilter ff_af_astats; extern AVFilter ff_af_astreamselect;