virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avfilter/f_ebur128: move variable declarations to usage site

Browse Source 
This is actually allowed by non-ancient versions of C.
This commit is contained in:
Niklas Haas
2025-06-13 17:04:02 +02:00
parent f362bacd27
commit 4c046517e7
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libavfilter/f_ebur128.c
View File

@ -652,7 +652,7 @@ void ff_ebur128_filter_channels_c(const EBUR128DSPContext *dsp,
static int filter_frame(AVFilterLink *inlink, AVFrame *insamples) static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
{ {
int i, ch, idx_insample, ret; int ret;
AVFilterContext *ctx = inlink->dst; AVFilterContext *ctx = inlink->dst;
EBUR128Context *ebur128 = ctx->priv; EBUR128Context *ebur128 = ctx->priv;
const EBUR128DSPContext *dsp = &ebur128->dsp; const EBUR128DSPContext *dsp = &ebur128->dsp;
@ -705,7 +705,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
} }
for (idx_insample = ebur128->idx_insample; idx_insample < nb_samples; idx_insample++) { 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_400 = ebur128->i400.cache_pos++;
const int bin_id_3000 = ebur128->i3000.cache_pos++; const int bin_id_3000 = ebur128->i3000.cache_pos++;
@ -741,7 +741,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
#define COMPUTE_LOUDNESS(m, time) do { \ #define COMPUTE_LOUDNESS(m, time) do { \
if (ebur128->i##time.filled) { \ if (ebur128->i##time.filled) { \
/* weighting sum of the last <time> ms */ \ /* weighting sum of the last <time> ms */ \
for (ch = 0; ch < nb_channels; ch++) \ for (int ch = 0; ch < nb_channels; ch++) \
power_##time += ebur128->ch_weighting[ch] * ebur128->i##time.sum[ch]; \ power_##time += ebur128->ch_weighting[ch] * ebur128->i##time.sum[ch]; \
power_##time /= I##time##_BINS(inlink->sample_rate); \ power_##time /= I##time##_BINS(inlink->sample_rate); \
} \ } \
@ -762,7 +762,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
/* compute integrated loudness by summing the histogram values /* compute integrated loudness by summing the histogram values
* above the relative threshold */ * above the relative threshold */
for (i = gate_hist_pos; i < HIST_SIZE; i++) { for (int i = gate_hist_pos; i < HIST_SIZE; i++) {
const unsigned nb_v = ebur128->i400.histogram[i].count; const unsigned nb_v = ebur128->i400.histogram[i].count;
nb_integrated += nb_v; nb_integrated += nb_v;
integrated_sum += nb_v * ebur128->i400.histogram[i].energy; integrated_sum += nb_v * ebur128->i400.histogram[i].energy;
@ -788,7 +788,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
int gate_hist_pos = gate_update(&ebur128->i3000, power_3000, int gate_hist_pos = gate_update(&ebur128->i3000, power_3000,
loudness_3000, LRA_GATE_THRES); loudness_3000, LRA_GATE_THRES);
for (i = gate_hist_pos; i < HIST_SIZE; i++) for (int i = gate_hist_pos; i < HIST_SIZE; i++)
nb_powers += ebur128->i3000.histogram[i].count; nb_powers += ebur128->i3000.histogram[i].count;
if (nb_powers) { if (nb_powers) {
uint64_t n, nb_pow; uint64_t n, nb_pow;
@ -796,7 +796,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
/* get lower loudness to consider */ /* get lower loudness to consider */
n = 0; n = 0;
nb_pow = LRA_LOWER_PRC * nb_powers * 0.01 + 0.5; nb_pow = LRA_LOWER_PRC * nb_powers * 0.01 + 0.5;
for (i = gate_hist_pos; i < HIST_SIZE; i++) { for (int i = gate_hist_pos; i < HIST_SIZE; i++) {
n += ebur128->i3000.histogram[i].count; n += ebur128->i3000.histogram[i].count;
if (n >= nb_pow) { if (n >= nb_pow) {
ebur128->lra_low = ebur128->i3000.histogram[i].loudness; ebur128->lra_low = ebur128->i3000.histogram[i].loudness;
@ -807,7 +807,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
/* get higher loudness to consider */ /* get higher loudness to consider */
n = nb_powers; n = nb_powers;
nb_pow = LRA_HIGHER_PRC * nb_powers * 0.01 + 0.5; nb_pow = LRA_HIGHER_PRC * nb_powers * 0.01 + 0.5;
for (i = HIST_SIZE - 1; i >= 0; i--) { for (int i = HIST_SIZE - 1; i >= 0; i--) {
n -= FFMIN(n, ebur128->i3000.histogram[i].count); n -= FFMIN(n, ebur128->i3000.histogram[i].count);
if (n < nb_pow) { if (n < nb_pow) {
ebur128->lra_high = ebur128->i3000.histogram[i].loudness; ebur128->lra_high = ebur128->i3000.histogram[i].loudness;
@ -909,7 +909,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
if (ebur128->peak_mode & PEAK_MODE_ ## ptype ## _PEAKS) { \ if (ebur128->peak_mode & PEAK_MODE_ ## ptype ## _PEAKS) { \
double max_peak = 0.0; \ double max_peak = 0.0; \
char key[64]; \ char key[64]; \
for (ch = 0; ch < nb_channels; ch++) { \ for (int ch = 0; ch < nb_channels; ch++) { \
snprintf(key, sizeof(key), \ snprintf(key, sizeof(key), \
META_PREFIX AV_STRINGIFY(name) "_peaks_ch%d", ch); \ META_PREFIX AV_STRINGIFY(name) "_peaks_ch%d", ch); \
max_peak = fmax(max_peak, ebur128->name##_peaks[ch]); \ max_peak = fmax(max_peak, ebur128->name##_peaks[ch]); \
@ -948,7 +948,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
#define PRINT_PEAKS(str, sp, ptype) do { \ #define PRINT_PEAKS(str, sp, ptype) do { \
if (ebur128->peak_mode & PEAK_MODE_ ## ptype ## _PEAKS) { \ if (ebur128->peak_mode & PEAK_MODE_ ## ptype ## _PEAKS) { \
av_log(ctx, ebur128->loglevel, " " str ":"); \ av_log(ctx, ebur128->loglevel, " " str ":"); \
for (ch = 0; ch < nb_channels; ch++) \ for (int ch = 0; ch < nb_channels; ch++) \
av_log(ctx, ebur128->loglevel, " %5.1f", DBFS(sp[ch])); \ av_log(ctx, ebur128->loglevel, " %5.1f", DBFS(sp[ch])); \
av_log(ctx, ebur128->loglevel, " dBFS"); \ av_log(ctx, ebur128->loglevel, " dBFS"); \
} \ } \