diff options
| author | Jean First <jeanfirst@gmail.com> | 2014-01-25 23:19:07 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2014-02-02 20:45:09 +0100 |
| commit | 2384cada120c7898c2e5a1726f4cb468c953d636 (patch) | |
| tree | 60ff9be68e85e9d15240b26304793970e47d965e | |
| parent | 6ef2315aafe352998fd612dd6cd21c4eb9731031 (diff) | |
| download | ffmpeg-streaming-2384cada120c7898c2e5a1726f4cb468c953d636.zip ffmpeg-streaming-2384cada120c7898c2e5a1726f4cb468c953d636.tar.gz | |
lavfi/ebur128: add true peak metering per frame
Signed-off-by: Jean First <jeanfirst@gmail.com>
| -rw-r--r-- | doc/filters.texi | 3 | ||||
| -rw-r--r-- | libavfilter/f_ebur128.c | 11 |
2 files changed, 12 insertions, 2 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index f04b30f..bcb00e5 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -9341,7 +9341,8 @@ Enable true-peak mode. If enabled, the peak lookup is done on an over-sampled version of the input stream for better peak accuracy. It logs a message for true-peak. -(identified by @code{TPK}). This mode requires a build with @code{libswresample}. +(identified by @code{TPK}) and true-peak per frame (identified by @code{FTPK}). +This mode requires a build with @code{libswresample}. @end table @end table diff --git a/libavfilter/f_ebur128.c b/libavfilter/f_ebur128.c index 53815ec..2e510db 100644 --- a/libavfilter/f_ebur128.c +++ b/libavfilter/f_ebur128.c @@ -96,6 +96,7 @@ typedef struct { int peak_mode; ///< enabled peak modes double *true_peaks; ///< true peaks per channel double *sample_peaks; ///< sample peaks per channel + double *true_peaks_per_frame; ///< true peaks in a frame per channel #if CONFIG_SWRESAMPLE SwrContext *swr_ctx; ///< over-sampling context for true peak metering double *swr_buf; ///< resampled audio data for true peak metering @@ -413,8 +414,10 @@ static int config_audio_output(AVFilterLink *outlink) ebur128->swr_buf = av_malloc(19200 * nb_channels * sizeof(double)); ebur128->true_peaks = av_calloc(nb_channels, sizeof(*ebur128->true_peaks)); + ebur128->true_peaks_per_frame = av_calloc(nb_channels, sizeof(*ebur128->true_peaks_per_frame)); ebur128->swr_ctx = swr_alloc(); - if (!ebur128->swr_buf || !ebur128->true_peaks || !ebur128->swr_ctx) + if (!ebur128->swr_buf || !ebur128->true_peaks || + !ebur128->true_peaks_per_frame || !ebur128->swr_ctx) return AVERROR(ENOMEM); av_opt_set_int(ebur128->swr_ctx, "in_channel_layout", outlink->channel_layout, 0); @@ -559,9 +562,13 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples) (const uint8_t **)insamples->data, nb_samples); if (ret < 0) return ret; + for (ch = 0; ch < nb_channels; ch++) + ebur128->true_peaks_per_frame[ch] = 0.0; for (idx_insample = 0; idx_insample < ret; idx_insample++) { for (ch = 0; ch < nb_channels; ch++) { ebur128->true_peaks[ch] = FFMAX(ebur128->true_peaks[ch], FFABS(*swr_samples)); + ebur128->true_peaks_per_frame[ch] = FFMAX(ebur128->true_peaks_per_frame[ch], + FFABS(*swr_samples)); swr_samples++; } } @@ -801,6 +808,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples) } while (0) PRINT_PEAKS("SPK", ebur128->sample_peaks, SAMPLES); + PRINT_PEAKS("FTPK", ebur128->true_peaks_per_frame, TRUE); PRINT_PEAKS("TPK", ebur128->true_peaks, TRUE); av_log(ctx, ebur128->loglevel, "\n"); } @@ -893,6 +901,7 @@ static av_cold void uninit(AVFilterContext *ctx) av_freep(&ebur128->ch_weighting); av_freep(&ebur128->true_peaks); av_freep(&ebur128->sample_peaks); + av_freep(&ebur128->true_peaks_per_frame); av_freep(&ebur128->i400.histogram); av_freep(&ebur128->i3000.histogram); for (i = 0; i < ebur128->nb_channels; i++) { |
