Showing the changes to libavfilter (1 of 2 files). Show all
Unified · Split
| @@ -58,6 +58,7 @@ · 57 unmodified lines | ||
| 58 | 58 | #define MEASURE_NOISE_FLOOR (1 << 22) |
| 59 | 59 | #define MEASURE_NOISE_FLOOR_COUNT (1 << 23) |
| 60 | 60 | #define MEASURE_ENTROPY (1 << 24) |
| 61 | +#define MEASURE_ABS_PEAK_COUNT (1 << 25) | |
| 61 | 62 | |
| 62 | 63 | #define MEASURE_MINMAXPEAK (MEASURE_MIN_LEVEL | MEASURE_MAX_LEVEL | MEASURE_PEAK_LEVEL) |
| 63 | 64 | |
| @@ -74,8 +75,10 @@ typedef struct ChannelStats { · 10 unmodified lines | ||
| 74 | 75 | double min_diff, max_diff; |
| 75 | 76 | double diff1_sum; |
| 76 | 77 | double diff1_sum_x2; |
| 78 | + double abs_peak; | |
| 77 | 79 | uint64_t mask, imask; |
| 78 | 80 | uint64_t min_count, max_count; |
| 81 | + uint64_t abs_peak_count; | |
| 79 | 82 | uint64_t noise_floor_count; |
| 80 | 83 | uint64_t zero_runs; |
| 81 | 84 | uint64_t nb_samples; |
| @@ -144,6 +147,7 @@ static const AVOption astats_options[] = { · 62 unmodified lines | ||
| 144 | 147 | { "RMS_trough" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_RMS_TROUGH }, 0, 0, FLAGS, "measure" }, |
| 145 | 148 | { "Zero_crossings" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_ZERO_CROSSINGS }, 0, 0, FLAGS, "measure" }, |
| 146 | 149 | { "Zero_crossings_rate" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_ZERO_CROSSINGS_RATE }, 0, 0, FLAGS, "measure" }, |
| 150 | + { "Abs_Peak_count" , "", 0, AV_OPT_TYPE_CONST, {.i64=MEASURE_ABS_PEAK_COUNT }, 0, 0, FLAGS, "measure" }, | |
| 147 | 151 | { "measure_overall", "Select the parameters which are measured overall", OFFSET(measure_overall), AV_OPT_TYPE_FLAGS, {.i64=MEASURE_ALL}, 0, UINT_MAX, FLAGS, "measure" }, |
| 148 | 152 | { NULL } |
| 149 | 153 | }; |
| @@ -159,6 +163,7 @@ static void reset_stats(AudioStatsContext *s) · 9 unmodified lines | ||
| 159 | 163 | |
| 160 | 164 | p->min = p->nmin = p->min_sigma_x2 = DBL_MAX; |
| 161 | 165 | p->max = p->nmax = p->max_sigma_x2 =-DBL_MAX; |
| 166 | + p->abs_peak = 0; | |
| 162 | 167 | p->min_non_zero = DBL_MAX; |
| 163 | 168 | p->min_diff = DBL_MAX; |
| 164 | 169 | p->max_diff = 0; |
| @@ -175,6 +180,7 @@ static void reset_stats(AudioStatsContext *s) · 10 unmodified lines | ||
| 175 | 180 | p->imask = 0xFFFFFFFFFFFFFFFF; |
| 176 | 181 | p->min_count = 0; |
| 177 | 182 | p->max_count = 0; |
| 183 | + p->abs_peak_count = 0; | |
| 178 | 184 | p->zero_runs = 0; |
| 179 | 185 | p->nb_samples = 0; |
| 180 | 186 | p->nb_nans = 0; |
| @@ -264,9 +270,16 @@ static inline void update_minmax(AudioStatsContext *s, ChannelStats *p, double d · 83 unmodified lines | ||
| 264 | 270 | |
| 265 | 271 | static inline void update_stat(AudioStatsContext *s, ChannelStats *p, double d, double nd, int64_t i) |
| 266 | 272 | { |
| 273 | + double abs_d = FFABS(d); | |
| 267 | 274 | double drop; |
| 268 | 275 | int index; |
| 269 | 276 | |
| 277 | + if (p->abs_peak < abs_d) { | |
| 278 | + p->abs_peak = abs_d; | |
| 279 | + p->abs_peak_count = 1; | |
| 280 | + } else if (p->abs_peak == abs_d) { | |
| 281 | + p->abs_peak_count++; | |
| 282 | + } | |
| 270 | 283 | if (d < p->min) { |
| 271 | 284 | p->min = d; |
| 272 | 285 | p->nmin = nd; |
| @@ -398,6 +411,7 @@ static void set_metadata(AudioStatsContext *s, AVDictionary **metadata) · 125 unmodified lines | ||
| 398 | 411 | { |
| 399 | 412 | uint64_t mask = 0, imask = 0xFFFFFFFFFFFFFFFF, min_count = 0, max_count = 0, nb_samples = 0, noise_floor_count = 0; |
| 400 | 413 | uint64_t nb_nans = 0, nb_infs = 0, nb_denormals = 0; |
| 414 | + uint64_t abs_peak_count = 0; | |
| 401 | 415 | double min_runs = 0, max_runs = 0, |
| 402 | 416 | min = DBL_MAX, max =-DBL_MAX, min_diff = DBL_MAX, max_diff = 0, |
| 403 | 417 | nmin = DBL_MAX, nmax =-DBL_MAX, |
| @@ -435,6 +449,7 @@ static void set_metadata(AudioStatsContext *s, AVDictionary **metadata) · 31 unmodified lines | ||
| 435 | 449 | entropy += p->entropy; |
| 436 | 450 | min_count += p->min_count; |
| 437 | 451 | max_count += p->max_count; |
| 452 | + abs_peak_count += p->abs_peak_count; | |
| 438 | 453 | min_runs += p->min_runs; |
| 439 | 454 | max_runs += p->max_runs; |
| 440 | 455 | mask |= p->mask; |
| @@ -474,6 +489,8 @@ static void set_metadata(AudioStatsContext *s, AVDictionary **metadata) · 33 unmodified lines | ||
| 474 | 489 | set_meta(metadata, c + 1, "Flat_factor", "%f", LINEAR_TO_DB((p->min_runs + p->max_runs) / (p->min_count + p->max_count))); |
| 475 | 490 | if (s->measure_perchannel & MEASURE_PEAK_COUNT) |
| 476 | 491 | set_meta(metadata, c + 1, "Peak_count", "%f", (float)(p->min_count + p->max_count)); |
| 492 | + if (s->measure_perchannel & MEASURE_ABS_PEAK_COUNT) | |
| 493 | + set_meta(metadata, c + 1, "Peak_count", "%f", p->abs_peak_count); | |
| 477 | 494 | if (s->measure_perchannel & MEASURE_NOISE_FLOOR) |
| 478 | 495 | set_meta(metadata, c + 1, "Noise_floor", "%f", LINEAR_TO_DB(p->noise_floor)); |
| 479 | 496 | if (s->measure_perchannel & MEASURE_NOISE_FLOOR_COUNT) |
| @@ -525,6 +542,8 @@ static void set_metadata(AudioStatsContext *s, AVDictionary **metadata) · 45 unmodified lines | ||
| 525 | 542 | set_meta(metadata, 0, "Overall.Flat_factor", "%f", LINEAR_TO_DB((min_runs + max_runs) / (min_count + max_count))); |
| 526 | 543 | if (s->measure_overall & MEASURE_PEAK_COUNT) |
| 527 | 544 | set_meta(metadata, 0, "Overall.Peak_count", "%f", (float)(min_count + max_count) / (double)s->nb_channels); |
| 545 | + if (s->measure_overall & MEASURE_ABS_PEAK_COUNT) | |
| 546 | + set_meta(metadata, 0, "Overall.Abs_Peak_count", "%f", (float)(abs_peak_count) / (double)s->nb_channels); | |
| 528 | 547 | if (s->measure_overall & MEASURE_NOISE_FLOOR) |
| 529 | 548 | set_meta(metadata, 0, "Overall.Noise_floor", "%f", LINEAR_TO_DB(noise_floor)); |
| 530 | 549 | if (s->measure_overall & MEASURE_NOISE_FLOOR_COUNT) |
| @@ -653,7 +672,7 @@ static void print_stats(AVFilterContext *ctx) · 122 unmodified lines | ||
| 653 | 672 | { |
| 654 | 673 | AudioStatsContext *s = ctx->priv; |
| 655 | 674 | uint64_t mask = 0, imask = 0xFFFFFFFFFFFFFFFF, min_count = 0, max_count = 0, nb_samples = 0, noise_floor_count = 0; |
| 656 | − uint64_t nb_nans = 0, nb_infs = 0, nb_denormals = 0; | |
| 675 | + uint64_t nb_nans = 0, nb_infs = 0, nb_denormals = 0, abs_peak_count = 0; | |
| 657 | 676 | double min_runs = 0, max_runs = 0, |
| 658 | 677 | min = DBL_MAX, max =-DBL_MAX, min_diff = DBL_MAX, max_diff = 0, |
| 659 | 678 | nmin = DBL_MAX, nmax =-DBL_MAX, |
| @@ -693,6 +712,7 @@ static void print_stats(AVFilterContext *ctx) · 33 unmodified lines | ||
| 693 | 712 | entropy += p->entropy; |
| 694 | 713 | min_count += p->min_count; |
| 695 | 714 | max_count += p->max_count; |
| 715 | + abs_peak_count += p->abs_peak_count; | |
| 696 | 716 | noise_floor_count += p->noise_floor_count; |
| 697 | 717 | min_runs += p->min_runs; |
| 698 | 718 | max_runs += p->max_runs; |
| @@ -736,6 +756,8 @@ static void print_stats(AVFilterContext *ctx) · 37 unmodified lines | ||
| 736 | 756 | av_log(ctx, AV_LOG_INFO, "Flat factor: %f\n", LINEAR_TO_DB((p->min_runs + p->max_runs) / (p->min_count + p->max_count))); |
| 737 | 757 | if (s->measure_perchannel & MEASURE_PEAK_COUNT) |
| 738 | 758 | av_log(ctx, AV_LOG_INFO, "Peak count: %"PRId64"\n", p->min_count + p->max_count); |
| 759 | + if (s->measure_perchannel & MEASURE_ABS_PEAK_COUNT) | |
| 760 | + av_log(ctx, AV_LOG_INFO, "Abs Peak count: %"PRId64"\n", p->abs_peak_count); | |
| 739 | 761 | if (s->measure_perchannel & MEASURE_NOISE_FLOOR) |
| 740 | 762 | av_log(ctx, AV_LOG_INFO, "Noise floor dB: %f\n", LINEAR_TO_DB(p->noise_floor)); |
| 741 | 763 | if (s->measure_perchannel & MEASURE_NOISE_FLOOR_COUNT) |
| @@ -792,6 +814,8 @@ static void print_stats(AVFilterContext *ctx) · 50 unmodified lines | ||
| 792 | 814 | av_log(ctx, AV_LOG_INFO, "Flat factor: %f\n", LINEAR_TO_DB((min_runs + max_runs) / (min_count + max_count))); |
| 793 | 815 | if (s->measure_overall & MEASURE_PEAK_COUNT) |
| 794 | 816 | av_log(ctx, AV_LOG_INFO, "Peak count: %f\n", (min_count + max_count) / (double)s->nb_channels); |
| 817 | + if (s->measure_overall & MEASURE_ABS_PEAK_COUNT) | |
| 818 | + av_log(ctx, AV_LOG_INFO, "Abs Peak count: %f\n", abs_peak_count / (double)s->nb_channels); | |
| 795 | 819 | if (s->measure_overall & MEASURE_NOISE_FLOOR) |
| 796 | 820 | av_log(ctx, AV_LOG_INFO, "Noise floor dB: %f\n", LINEAR_TO_DB(noise_floor)); |
| 797 | 821 | if (s->measure_overall & MEASURE_NOISE_FLOOR_COUNT) |