From patchwork Sun Aug 13 03:14:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 43219 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6aa0:b0:130:ccc6:6c4b with SMTP id bi32csp643871pzb; Sat, 12 Aug 2023 20:15:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH069ownwNUjhzn0FgBEhHye+mIvwpMLADc1unb2oQiyMxFvAua29TijuF+th3qK98i8Lew X-Received: by 2002:a50:ed13:0:b0:523:ae0a:a446 with SMTP id j19-20020a50ed13000000b00523ae0aa446mr5217594eds.24.1691896516861; Sat, 12 Aug 2023 20:15:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691896516; cv=none; d=google.com; s=arc-20160816; b=uyHRqLhUTZ01LERFZtPD4LZdNbumuY7gmC2sQucZJ3VGBudaWmm0PzKejjJoHZBUd9 fmB0rGEO2dvNmuN49krT6W3kpnCbMTsiTX8r4Ej+g7ZyZPNmv8oc5fay0NS4/oVmyh3u MH+HI5A0Un3PoMZmCvM3JKX47QCg8qIX1/VMmM4aWiBVJiAvquiCTrNBEcsPPpHQpov0 ia6Dh1ot6klEP1+KsAXAGR2Bw3FEynrmMRs8+6jLV3/ZDNTIMTiv2SZQKTAiY2Pqn4rL lXzixsPxR/woqAO8W4apNY4upiUGfurL/g6YWJd5LA5CKBGm1oPV/hQNOtFCBxW9Wwqm 7FoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to; bh=ONnMvGB1t5sHG+C0jkP79oc1DwzGLB13VecIfSCp0Gk=; fh=ghmNPjFTSM6oKC/7k5yo9hnu8V2TFPrY7GkS/gBuc+4=; b=RU4TobjVZS+qA3R40yKgzhi2+oCpCrxvwl/TiaK882TqZYoDwoRDbE26eY+s3WoKaS hCrliuXElzDiNJfpkNUtzd21//l9owzQrFnl6AQD7x6jer5SpAOHbVyJpIF0qw9lBffS 3MuBhEgzlIJiDTTF/6khoBwNZWLJfhuKjIg8qdVWhI4UFMemynix7jI0m3xpguI1/acU u/Ln5jCtMYsz7oc3b/lzJKFBu6yrx49rauS7okxvcxg7iIOqyfe83XnklYw39Nv47i06 RCGKcd70dsOs1Zi1VDt09pZ6wM91sDFI4+41gaiz+IoeehC1tSgLaNHD3CQrmDIQM4h2 jPog== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=aWOG6ucW; 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 y23-20020aa7c257000000b005232901160dsi5920321edo.485.2023.08.12.20.15.15; Sat, 12 Aug 2023 20:15:16 -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=20221208 header.b=aWOG6ucW; 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 18C6A68C430; Sun, 13 Aug 2023 06:15:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ua1-f42.google.com (mail-ua1-f42.google.com [209.85.222.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E9CAA68C06B for ; Sun, 13 Aug 2023 06:15:03 +0300 (EEST) Received: by mail-ua1-f42.google.com with SMTP id a1e0cc1a2514c-79969c14964so1001226241.2 for ; Sat, 12 Aug 2023 20:15:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691896502; x=1692501302; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=i9pptQmM3h/gzkdVyzLKNetot5neMzLDsebLRJ/TjCA=; b=aWOG6ucWJtUmByDEH1w72Xu2O3rOY0fHEJFbxPEc6Rq89XN4XikuEVb5DApmBdM0+n H8zn0f9iJT/ssbty0l7yRjtyXDBwUrUyU0xp/ZqsMKOpS9t+y9i+xfi+gXqNVIhUDFqe UVIWr82Ozaw5WqPmv+/8CEzW3AOhtFrjAu7hg/NU+5ZjebMCnlmrA8znF5WPtITn8rqq mGfRQObRyDLivNSSGXXlw9v5XBSuc1lZU07GOn4pmIqDtTMaFein0XRrVpVRq9H5MbCm BBI56WrDmaeGnmVKbRtW4ivFjojWzXC3NAxc8YvsawOjnPWAJxJpJ2L+RtSVHaulmaMA vClQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691896502; x=1692501302; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=i9pptQmM3h/gzkdVyzLKNetot5neMzLDsebLRJ/TjCA=; b=hGuT9TGxcYhuiK90MWyFR1bVhHhXnoAI/JHz94iF2ij0BkIv8vCbcV5BD5Qj3UHBgj F1e7zk5aH3dh5UnZP7LrR9yAozRGkRoAW5YV+MtwuV/0lmJHIKpzCDQ1RJXYnxocL5VO GOhwnRnjnDQQudPUtuwTW95u2pQ8Ta63wflGHeAYl4LISf0HqR3pX1GU2f79+Nc6OnFz sMO7KaE5v6XkZe20ThifgG9Zjo18u0nWF8iIpAroyQC1QCuO3elPaga7MT+m0PHs6Ct9 Bx8r8lktg4fIxLaSbW11x7dBJq2wE0bpbKdigODtEjyzHesTdT+m066yEYqOful4IAW6 sPkw== X-Gm-Message-State: AOJu0Yy3JjKVWf8C+Rf9Qbf3bwtYsf7cRRHt2cD+EugxeoE5xLkUR6Z2 qTMNQCR3vyb33LZskUQ9C3N8Imc5/FJi8WLDaPCAyU0t X-Received: by 2002:a05:6102:218:b0:440:a8c8:f34 with SMTP id z24-20020a056102021800b00440a8c80f34mr4868388vsp.3.1691896501873; Sat, 12 Aug 2023 20:15:01 -0700 (PDT) MIME-Version: 1.0 From: Paul B Mahol Date: Sun, 13 Aug 2023 05:14:48 +0200 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH] apsnr and asisdr 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: KqinXub90dW+ Attached. From 8b457c83855ccc292a53be2bd716bf445d37d7e0 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Sun, 13 Aug 2023 02:57:57 +0200 Subject: [PATCH 1/3] avfilter: add apsnr filter Signed-off-by: Paul B Mahol --- doc/filters.texi | 7 +++++ libavfilter/Makefile | 1 + libavfilter/af_asdr.c | 67 ++++++++++++++++++++++++++++++++++++++-- libavfilter/allfilters.c | 1 + 4 files changed, 73 insertions(+), 3 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index e041adc40f..1025917c63 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -2892,6 +2892,13 @@ Default value is 8. This filter supports the all above options as @ref{commands}. +@section apsnr +Measure Audio Peak Signal-to-Noise Ratio. + +This filter takes two audio streams for input, and outputs first +audio stream. +Results are in dB per channel at end of either input. + @section apsyclip Apply Psychoacoustic clipper to input audio stream. diff --git a/libavfilter/Makefile b/libavfilter/Makefile index b26a85a7d2..90c30e3388 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -85,6 +85,7 @@ OBJS-$(CONFIG_APAD_FILTER) += af_apad.o OBJS-$(CONFIG_APERMS_FILTER) += f_perms.o OBJS-$(CONFIG_APHASER_FILTER) += af_aphaser.o generate_wave_table.o OBJS-$(CONFIG_APHASESHIFT_FILTER) += af_afreqshift.o +OBJS-$(CONFIG_APSNR_FILTER) += af_asdr.o OBJS-$(CONFIG_APSYCLIP_FILTER) += af_apsyclip.o OBJS-$(CONFIG_APULSATOR_FILTER) += af_apulsator.o OBJS-$(CONFIG_AREALTIME_FILTER) += f_realtime.o diff --git a/libavfilter/af_asdr.c b/libavfilter/af_asdr.c index 7d778b7f6b..b0401804f6 100644 --- a/libavfilter/af_asdr.c +++ b/libavfilter/af_asdr.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + #include "libavutil/channel_layout.h" #include "libavutil/common.h" @@ -27,6 +29,8 @@ typedef struct AudioSDRContext { int channels; + uint64_t nb_samples; + double max; double *sum_u; double *sum_uv; @@ -67,6 +71,34 @@ static int sdr_##name(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)\ SDR_FILTER(fltp, float) SDR_FILTER(dblp, double) +#define PSNR_FILTER(name, type) \ +static int psnr_##name(AVFilterContext *ctx, void *arg, int jobnr,int nb_jobs)\ +{ \ + AudioSDRContext *s = ctx->priv; \ + AVFrame *u = s->cache[0]; \ + AVFrame *v = s->cache[1]; \ + const int channels = u->ch_layout.nb_channels; \ + const int start = (channels * jobnr) / nb_jobs; \ + const int end = (channels * (jobnr+1)) / nb_jobs; \ + const int nb_samples = u->nb_samples; \ + \ + for (int ch = start; ch < end; ch++) { \ + const type *const us = (type *)u->extended_data[ch]; \ + const type *const vs = (type *)v->extended_data[ch]; \ + double sum_uv = 0.; \ + \ + for (int n = 0; n < nb_samples; n++) \ + sum_uv += (us[n] - vs[n]) * (us[n] - vs[n]); \ + \ + s->sum_uv[ch] += sum_uv; \ + } \ + \ + return 0; \ +} + +PSNR_FILTER(fltp, float) +PSNR_FILTER(dblp, double) + static int activate(AVFilterContext *ctx) { AudioSDRContext *s = ctx->priv; @@ -97,6 +129,7 @@ static int activate(AVFilterContext *ctx) out = s->cache[0]; s->cache[0] = NULL; + s->nb_samples += available; return ff_filter_frame(outlink, out); } @@ -126,7 +159,12 @@ static int config_output(AVFilterLink *outlink) AudioSDRContext *s = ctx->priv; s->channels = inlink->ch_layout.nb_channels; - s->filter = inlink->format == AV_SAMPLE_FMT_FLTP ? sdr_fltp : sdr_dblp; + + if (!strcmp(ctx->filter->name, "asdr")) + s->filter = inlink->format == AV_SAMPLE_FMT_FLTP ? sdr_fltp : sdr_dblp; + else + s->filter = inlink->format == AV_SAMPLE_FMT_FLTP ? psnr_fltp : psnr_dblp; + s->max = inlink->format == AV_SAMPLE_FMT_FLTP ? FLT_MAX : DBL_MAX; s->sum_u = av_calloc(outlink->ch_layout.nb_channels, sizeof(*s->sum_u)); s->sum_uv = av_calloc(outlink->ch_layout.nb_channels, sizeof(*s->sum_uv)); @@ -140,8 +178,16 @@ static av_cold void uninit(AVFilterContext *ctx) { AudioSDRContext *s = ctx->priv; - for (int ch = 0; ch < s->channels; ch++) - av_log(ctx, AV_LOG_INFO, "SDR ch%d: %g dB\n", ch, 20. * log10(s->sum_u[ch] / s->sum_uv[ch])); + if (!strcmp(ctx->filter->name, "asdr")) { + for (int ch = 0; ch < s->channels; ch++) + av_log(ctx, AV_LOG_INFO, "SDR ch%d: %g dB\n", ch, 20. * log10(s->sum_u[ch] / s->sum_uv[ch])); + } else { + for (int ch = 0; ch < s->channels; ch++) { + double psnr = s->sum_uv[ch] > 0.0 ? 2.0 * log(s->max) - log(s->nb_samples / s->sum_uv[ch]) : INFINITY; + + av_log(ctx, AV_LOG_INFO, "PSNR ch%d: %g dB\n", ch, psnr); + } + } av_frame_free(&s->cache[0]); av_frame_free(&s->cache[1]); @@ -183,3 +229,18 @@ const AVFilter ff_af_asdr = { FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_DBLP), }; + +const AVFilter ff_af_apsnr = { + .name = "apsnr", + .description = NULL_IF_CONFIG_SMALL("Measure Audio Peak Signal-to-Noise Ratio."), + .priv_size = sizeof(AudioSDRContext), + .activate = activate, + .uninit = uninit, + .flags = AVFILTER_FLAG_METADATA_ONLY | + AVFILTER_FLAG_SLICE_THREADS | + AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, + FILTER_INPUTS(inputs), + FILTER_OUTPUTS(outputs), + FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_FLTP, + AV_SAMPLE_FMT_DBLP), +}; diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 286e601799..949c5d4992 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -71,6 +71,7 @@ extern const AVFilter ff_af_apad; extern const AVFilter ff_af_aperms; extern const AVFilter ff_af_aphaser; extern const AVFilter ff_af_aphaseshift; +extern const AVFilter ff_af_apsnr; extern const AVFilter ff_af_apsyclip; extern const AVFilter ff_af_apulsator; extern const AVFilter ff_af_arealtime; -- 2.39.1