From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTPS id 495CB4D415
for <ffmpegdev@gitmailbox.com>; Tue, 17 Jun 2025 12:08:02 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id EFEBD68CF0A;
Tue, 17 Jun 2025 15:06:32 +0300 (EEST)
Received: from haasn.dev (haasn.dev [78.46.187.166])
by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id CA47968CCF4
for <ffmpeg-devel@ffmpeg.org>; Tue, 17 Jun 2025 15:06:15 +0300 (EEST)
Received: from haasn.dev (unknown [10.30.1.1])
by haasn.dev (Postfix) with UTF8SMTP id 5922D436BD;
Tue, 17 Jun 2025 14:06:11 +0200 (CEST)
From: Niklas Haas <ffmpeg@haasn.xyz>
To: ffmpeg-devel@ffmpeg.org
Date: Tue, 17 Jun 2025 14:06:05 +0200
Message-ID: <20250617120609.1987435-12-ffmpeg@haasn.xyz>
X-Mailer: git-send-email 2.49.0
In-Reply-To: <20250617120609.1987435-1-ffmpeg@haasn.xyz>
References: <20250617120609.1987435-1-ffmpeg@haasn.xyz>
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH v4 12/13] avfilter/f_ebur128: move true peak
calculation to DSP function
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: Niklas Haas <git@haasn.dev>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/20250617120609.1987435-12-ffmpeg@haasn.xyz/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
From: Niklas Haas <git@haasn.dev>
---
libavfilter/f_ebur128.c | 43 ++++++++++++++++++++++++++---------------
libavfilter/f_ebur128.h | 4 ++++
2 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/libavfilter/f_ebur128.c b/libavfilter/f_ebur128.c
index 1fb7129271..0adc89c823 100644
--- a/libavfilter/f_ebur128.c
+++ b/libavfilter/f_ebur128.c
@@ -580,6 +580,8 @@ static av_cold int init(AVFilterContext *ctx)
av_log(ctx, AV_LOG_VERBOSE, "EBU +%d scale\n", ebur128->meter);
ebur128->dsp.filter_channels = ff_ebur128_filter_channels_c;
+ ebur128->dsp.true_peak = ff_ebur128_true_peak_c;
+
#if ARCH_X86
ff_ebur128_init_x86(&ebur128->dsp);
#endif
@@ -650,6 +652,28 @@ void ff_ebur128_filter_channels_c(const EBUR128DSPContext *dsp,
}
}
+double ff_ebur128_true_peak_c(double *restrict true_peaks,
+ double *restrict true_peaks_per_frame,
+ const int nb_channels, const double *samples,
+ const int nb_samples)
+{
+ double maxpeak = 0.0;
+ for (int ch = 0; ch < nb_channels; ch++) {
+ double tp = true_peaks[ch];
+ double tppf = 0.0f;
+ for (int i = 0; i < nb_samples; i++) {
+ const double sample = fabs(samples[i * nb_channels]);
+ tp = FFMAX(tp, sample);
+ tppf = FFMAX(tppf, sample);
+ }
+ maxpeak = FFMAX(maxpeak, tp);
+ true_peaks[ch] = tp;
+ true_peaks_per_frame[ch] = tppf;
+ }
+
+ return maxpeak;
+}
+
static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
{
int ret;
@@ -669,21 +693,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
if (ret < 0)
return ret;
- double maxpeak = 0.0;
- for (int ch = 0; ch < nb_channels; ch++) {
- double tp = ebur128->true_peaks[ch];
- double tppf = 0.0;
- for (int i = 0; i < ret; i++) {
- const double sample = fabs(swr_samples[i * nb_channels]);
- tp = FFMAX(tp, sample);
- tppf = FFMAX(tppf, sample);
- }
- maxpeak = FFMAX(maxpeak, tp);
- ebur128->true_peaks[ch] = tp;
- ebur128->true_peaks_per_frame[ch] = tppf;
- }
-
- ebur128->true_peak = DBFS(maxpeak);
+ ebur128->true_peak = DBFS(dsp->true_peak(ebur128->true_peaks,
+ ebur128->true_peaks_per_frame,
+ nb_channels, swr_samples, ret));
}
#endif
@@ -704,7 +716,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
ebur128->sample_peak = DBFS(maxpeak);
}
-
for (int idx_insample = ebur128->idx_insample; idx_insample < nb_samples; idx_insample++) {
const int bin_id_400 = ebur128->i400.cache_pos++;
const int bin_id_3000 = ebur128->i3000.cache_pos++;
diff --git a/libavfilter/f_ebur128.h b/libavfilter/f_ebur128.h
index 1889e28bdd..8aab7838a0 100644
--- a/libavfilter/f_ebur128.h
+++ b/libavfilter/f_ebur128.h
@@ -45,6 +45,8 @@ typedef struct EBUR128DSPContext {
double *cache_400, double *cache_3000,
double *sum_400, double *sum_3000,
int nb_channels);
+
+ double (*true_peak)(double *, double *, int, const double *, int);
} EBUR128DSPContext;
static_assert(offsetof(EBUR128DSPContext, pre) == 0, "struct layout mismatch");
@@ -56,4 +58,6 @@ void ff_ebur128_init_x86(EBUR128DSPContext *dsp);
void ff_ebur128_filter_channels_c(const EBUR128DSPContext *, const double *,
double *, double *, double *, double *, int);
+double ff_ebur128_true_peak_c(double *, double *, int, const double *, int);
+
#endif /* AVFILTER_F_EBUR128_H */
--
2.49.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".