virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avfilter/f_ebur128: use unsigned for hist_entry.count

Browse Source 
Also when summing multiple hist_entry.count use uint64_t for accumulator.
This commit is contained in:
Paul B Mahol
2022-02-24 10:04:43 +01:00
parent b0f8dbb0ca
commit d5ad1d7847
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavfilter/f_ebur128.c
View File

@@ -55,7 +55,7 @@
* infinitely over the time and is thus more scalable. * infinitely over the time and is thus more scalable.
*/ */
struct hist_entry { struct hist_entry {
int count; ///< how many times the corresponding value occurred unsigned count; ///< how many times the corresponding value occurred
double energy; ///< E = 10^((L + 0.691) / 10) double energy; ///< E = 10^((L + 0.691) / 10)
double loudness; ///< L = -0.691 + 10 * log10(E) double loudness; ///< L = -0.691 + 10 * log10(E)
}; };
@@ -722,15 +722,15 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
#define I_GATE_THRES -10 // initially defined to -8 LU in the first EBU standard #define I_GATE_THRES -10 // initially defined to -8 LU in the first EBU standard
if (loudness_400 >= ABS_THRES) { if (loudness_400 >= ABS_THRES) {
double integrated_sum = 0; double integrated_sum = 0.0;
int nb_integrated = 0; uint64_t nb_integrated = 0;
int gate_hist_pos = gate_update(&ebur128->i400, power_400, int gate_hist_pos = gate_update(&ebur128->i400, power_400,
loudness_400, I_GATE_THRES); loudness_400, I_GATE_THRES);
/* 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 (i = gate_hist_pos; i < HIST_SIZE; i++) {
const int 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;
} }
@@ -751,14 +751,14 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
/* XXX: example code in EBU 3342 is ">=" but formula in BS.1770 /* XXX: example code in EBU 3342 is ">=" but formula in BS.1770
* specs is ">" */ * specs is ">" */
if (loudness_3000 >= ABS_THRES) { if (loudness_3000 >= ABS_THRES) {
int nb_powers = 0; uint64_t nb_powers = 0;
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 (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) {
int n, nb_pow; uint64_t n, nb_pow;
/* get lower loudness to consider */ /* get lower loudness to consider */
n = 0; n = 0;