From patchwork Wed Mar 7 11:15:11 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: 7845 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.181.170 with SMTP id m39csp4847628jaj; Wed, 7 Mar 2018 03:16:06 -0800 (PST) X-Google-Smtp-Source: AG47ELupvDg2tZou3ZOT0pTh1XvtpzlY96OSZjkjS7u5RwD3jLvh+KzQpeh5QXLl4HC7p5ksF61T X-Received: by 10.223.136.44 with SMTP id d41mr20012126wrd.127.1520421366721; Wed, 07 Mar 2018 03:16:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520421366; cv=none; d=google.com; s=arc-20160816; b=GSF1vh4EMZjKeXCmFtsr3BofygVm4MgzosJmbJjVCa3atFUhtauBDMQV39AzZImh4+ I25+JPaKgcBM+VVfob2zq+FZW62NTCwJT8hKL0QPz97QF8pBcuF3ZfoBGrwMpOSwMEa/ nj9Ieu0qMnlkHsRQaKfp+iw1p38vp7LSLkppzI2Ct3RlYHJwxJacDbqGv1wqPUl2u0OA YgN8bgzWf2bFWGUvJCIwNdzxPMM5sYouYk3AQg7wnH8yFBRSZ5T1hTCO2dnXwhO3SyrN M88Dgzyimm8WNn0/INV/aXslQvh/Svg8fpSx9/XnNGm60nlPSHB3F8BEAKupDZGfyZOX xYRA== 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=jQlu4qqpzKieuc89CSvJOvzC3kDM8sUrn4TX5ZgnEvY=; b=VQf7zAVZTakJmT1t0HgtNW1moP6HXf1sY/X7/C5k28qavgSffIpd0/BxxwPJ17wSXO q6cN1AfOP50GRxcKotLb80uPvqZGW0mU8QghEs941yD5eavnQPPflFyka41ywFa6UdOF vaSETjNwUVCN93Ern9nNnW+d0Q+BcKLkAqD3Tp+AJU5s3w+GzsZ0COBYPBRrmmJFx5VH mM7PV6EsM3ZEYrDkGREAWWcq1Vj6ozjMJeRmTmvN9zvMfMa1sxYAJ+I14yw2qAIKRhXW qYRC7JegGStA+iZyLI6u4I7H8wcgaF9BCHdTuKRWQAwIcIsMgz8ZzWZasoWzIIVmV4Om SpOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ALuJdH4d; 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 z84si3034208wmc.68.2018.03.07.03.16.05; Wed, 07 Mar 2018 03:16:06 -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=ALuJdH4d; 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 BBE7A689F3C; Wed, 7 Mar 2018 13:15:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f48.google.com (mail-wm0-f48.google.com [74.125.82.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 67AE568A281 for ; Wed, 7 Mar 2018 13:15:49 +0200 (EET) Received: by mail-wm0-f48.google.com with SMTP id s206so22228593wme.0 for ; Wed, 07 Mar 2018 03:15:57 -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=EzZHiAtnPbBLQuAFQ6MI3EAk48auW+LJkFfdOQPzn7E=; b=ALuJdH4d/5eJaP9p6qLTEEyOrsr3fxqJ+8QxEB2EVVudX6Zn0taCNba0uoIonvcctt WnPhNtIjKBPPYthL9jbuHG3KtmJFuVvcqPrdYvy9gWzWQ2KxNMVHNV+k4s+3eb3/0XIr 7Eq7SyuTBH1O0q4yHbxOfGPxkAT/N0NjZOivuOSg4hCPw6KhQCIDsxUnQ9iJ6N0zCZpO eXb+WmoeNcUmbBo3IwpMqEjZ8qQ1lntX52nKqKtDBNFgFQJGrDh9veYJ8Zuon2qML3aQ JrUs7KnOEbUJSmrLezmAg05PEqfyRKzB89y89vQElcCoYJIzSO8+DdR+tPHbuHiGRcon zMeQ== 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=EzZHiAtnPbBLQuAFQ6MI3EAk48auW+LJkFfdOQPzn7E=; b=NOCqLrRGhAuJ18+UIqFH4qKIs/e6VjEfhYW9gZ2a1h1e9xqRZeYtifgw/xZ3UWLkim TecGwwEnnn/q9DVzVIsQI0Cz7C1W4VUHFJSwq2talXfYL55zE6l82ynGUtpcrsQOKLWL yUknZfqCNDNJK0avSvmp55UnQ3ZmwjK4Rr7iPaib/UbbNJVCPUkAheo9ZM7Q4tEhacfK ZzVNSkJ42nBN/xJ5JBMMPgFCCAG/EHXk4YuXqcP3R6WxMe5UOSoGJtCFa2IweMt1WkoX FfQhixTFJAayS7SNfxNSxovBrUEZWNMny2Ixp+k4y2ur7ot9xRBeWD7YURpH8VtyKCir owcQ== X-Gm-Message-State: AElRT7Fkx5lp3QvjI4mqGRdhSxbV+0JPHp49JawtNqFpjv7QCCjzI2c3 CE5VU4us/cQkj39rgesqf4VeKw== X-Received: by 10.28.190.19 with SMTP id o19mr13967541wmf.53.1520421356620; Wed, 07 Mar 2018 03:15:56 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id v8sm5424820wmh.25.2018.03.07.03.15.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Mar 2018 03:15:55 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 7 Mar 2018 12:15:11 +0100 Message-Id: <20180307111511.1986-1-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 Subject: [FFmpeg-devel] [PATCH] avfilter: add drmeter audio 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 | 11 +++ libavfilter/Makefile | 1 + libavfilter/af_drmeter.c | 233 +++++++++++++++++++++++++++++++++++++++++++++++ libavfilter/allfilters.c | 1 + 4 files changed, 246 insertions(+) create mode 100644 libavfilter/af_drmeter.c diff --git a/doc/filters.texi b/doc/filters.texi index 7151d4c748..c166aae788 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -2538,6 +2538,17 @@ Optional. It should have a value much less than 1 (e.g. 0.05 or 0.02) and is used to prevent clipping. @end table +@section drmeter +Measure audio dynamic range. + +The filter accepts the following options: + +@table @option +@item length +Set window lenght in seconds used to split audio into segments of equal length. +Default is 3 seconds. +@end table + @section dynaudnorm Dynamic Audio Normalizer. diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 6a6083618d..fc16512e2c 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -87,6 +87,7 @@ OBJS-$(CONFIG_COMPENSATIONDELAY_FILTER) += af_compensationdelay.o OBJS-$(CONFIG_CROSSFEED_FILTER) += af_crossfeed.o OBJS-$(CONFIG_CRYSTALIZER_FILTER) += af_crystalizer.o OBJS-$(CONFIG_DCSHIFT_FILTER) += af_dcshift.o +OBJS-$(CONFIG_DRMETER_FILTER) += af_drmeter.o OBJS-$(CONFIG_DYNAUDNORM_FILTER) += af_dynaudnorm.o OBJS-$(CONFIG_EARWAX_FILTER) += af_earwax.o OBJS-$(CONFIG_EBUR128_FILTER) += f_ebur128.o diff --git a/libavfilter/af_drmeter.c b/libavfilter/af_drmeter.c new file mode 100644 index 0000000000..d088d8e08f --- /dev/null +++ b/libavfilter/af_drmeter.c @@ -0,0 +1,233 @@ +/* + * 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 + +#include "libavutil/ffmath.h" +#include "libavutil/opt.h" +#include "audio.h" +#include "avfilter.h" +#include "internal.h" + +typedef struct ChannelStats { + uint64_t nb_samples; + uint64_t blknum; + float peak; + float sum; + uint32_t peaks[10001]; + uint32_t rms[10001]; +} ChannelStats; + +typedef struct DRMeterContext { + const AVClass *class; + ChannelStats *chstats; + int nb_channels; + uint64_t tc_samples; + double time_constant; +} DRMeterContext; + +#define OFFSET(x) offsetof(DRMeterContext, x) +#define FLAGS AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM + +static const AVOption drmeter_options[] = { + { "length", "set the window length", OFFSET(time_constant), AV_OPT_TYPE_DOUBLE, {.dbl=3}, .01, 10, FLAGS }, + { NULL } +}; + +AVFILTER_DEFINE_CLASS(drmeter); + +static int query_formats(AVFilterContext *ctx) +{ + AVFilterFormats *formats; + AVFilterChannelLayouts *layouts; + static const enum AVSampleFormat sample_fmts[] = { + AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_FLT, + 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) +{ + DRMeterContext *s = outlink->src->priv; + + s->chstats = av_calloc(sizeof(*s->chstats), outlink->channels); + if (!s->chstats) + return AVERROR(ENOMEM); + s->nb_channels = outlink->channels; + s->tc_samples = s->time_constant * outlink->sample_rate + .5; + + return 0; +} + +static void finish_block(ChannelStats *p) +{ + int peak_bin, rms_bin; + float peak, rms; + + rms = sqrt(2 * p->sum / p->nb_samples); + peak = p->peak; + rms_bin = av_clip(rms * 10000, 0, 10000); + peak_bin = av_clip(peak * 10000, 0, 10000); + p->rms[rms_bin]++; + p->peaks[peak_bin]++; + + p->peak = 0; + p->sum = 0; + p->nb_samples = 0; + p->blknum++; +} + +static void update_stat(DRMeterContext *s, ChannelStats *p, float sample) +{ + if (p->nb_samples >= s->tc_samples) { + finish_block(p); + } + + p->peak = FFMAX(FFABS(sample), p->peak); + p->sum += sample * sample; + p->nb_samples++; +} + +static int filter_frame(AVFilterLink *inlink, AVFrame *buf) +{ + DRMeterContext *s = inlink->dst->priv; + const int channels = s->nb_channels; + int i, c; + + switch (inlink->format) { + case AV_SAMPLE_FMT_FLTP: + for (c = 0; c < channels; c++) { + ChannelStats *p = &s->chstats[c]; + const float *src = (const float *)buf->extended_data[c]; + + for (i = 0; i < buf->nb_samples; i++, src++) + update_stat(s, p, *src); + } + break; + case AV_SAMPLE_FMT_FLT: { + const float *src = (const float *)buf->extended_data[0]; + + for (i = 0; i < buf->nb_samples; i++) { + for (c = 0; c < channels; c++, src++) + update_stat(s, &s->chstats[c], *src); + }} + break; + } + + return ff_filter_frame(inlink->dst->outputs[0], buf); +} + +#define SQR(a) ((a)*(a)) + +static void print_stats(AVFilterContext *ctx) +{ + DRMeterContext *s = ctx->priv; + float dr = 0; + int ch; + + for (ch = 0; ch < s->nb_channels; ch++) { + ChannelStats *p = &s->chstats[ch]; + float chdr, secondpeak, rmssum = 0; + int i, j, first = 0; + + finish_block(p); + + for (i = 0; i <= 10000; i++) { + if (p->peaks[10000 - i]) { + if (first) + break; + first = 1; + } + } + + secondpeak = (10000 - i) / 10000.; + + for (i = 10000, j = 0; i >= 0 && j < 0.2 * p->blknum; i--) { + if (p->rms[i]) { + rmssum += SQR(i / 10000.) * p->rms[i]; + j += p->rms[i]; + } + } + + chdr = round(20 * log10(secondpeak / sqrt(rmssum / (0.2 * p->blknum)))); + dr += chdr; + av_log(ctx, AV_LOG_INFO, "Channel %d: DR = %.0f\n", ch + 1, chdr); + } + + av_log(ctx, AV_LOG_INFO, "Overall DR = %.2f\n", dr / s->nb_channels); +} + +static av_cold void uninit(AVFilterContext *ctx) +{ + DRMeterContext *s = ctx->priv; + + if (s->nb_channels) + print_stats(ctx); + av_freep(&s->chstats); +} + +static const AVFilterPad drmeter_inputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_AUDIO, + .filter_frame = filter_frame, + }, + { NULL } +}; + +static const AVFilterPad drmeter_outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_AUDIO, + .config_props = config_output, + }, + { NULL } +}; + +AVFilter ff_af_drmeter = { + .name = "drmeter", + .description = NULL_IF_CONFIG_SMALL("Measure audio dynamic range."), + .query_formats = query_formats, + .priv_size = sizeof(DRMeterContext), + .priv_class = &drmeter_class, + .uninit = uninit, + .inputs = drmeter_inputs, + .outputs = drmeter_outputs, +}; diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 9adb1090b7..cc423af738 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -98,6 +98,7 @@ static void register_all(void) REGISTER_FILTER(CROSSFEED, crossfeed, af); REGISTER_FILTER(CRYSTALIZER, crystalizer, af); REGISTER_FILTER(DCSHIFT, dcshift, af); + REGISTER_FILTER(DRMETER, drmeter, af); REGISTER_FILTER(DYNAUDNORM, dynaudnorm, af); REGISTER_FILTER(EARWAX, earwax, af); REGISTER_FILTER(EBUR128, ebur128, af);