History

lavfi/avf_showwaves: fix extra gaps at end of waveform

Fixes #5931.

Paul B Mahol committed 7 years ago

Commit dafcdeb1 parent 833ae5f1 file · +8 −4Browse files

Showing the changes to libavfilter (1 of 1 file). Show all

Unified · Split

libavfilter/avf_showwaves.c+8−4
@@ -559,7 +559,9 @@ static int push_single_pic(AVFilterLink *outlink) · 558 unmodified lines
559559 AVFilterContext *ctx = outlink->src;
560560 AVFilterLink *inlink = ctx->inputs[0];
561561 ShowWavesContext *showwaves = ctx->priv;
562− int64_t n = 0, max_samples = showwaves->total_samples / outlink->w;
562+ int64_t n = 0, column_max_samples = showwaves->total_samples / outlink->w;
563+ int64_t remaining_samples = showwaves->total_samples - (column_max_samples * outlink->w);
564+ int64_t last_column_samples = column_max_samples + remaining_samples;
563565 AVFrame *out = showwaves->outpicref;
564566 struct frame_node *node;
565567 const int nb_channels = inlink->channels;
@@ -569,12 +571,12 @@ static int push_single_pic(AVFilterLink *outlink) · 3 unmodified lines
569571 int col = 0;
570572 int64_t *sum = showwaves->sum;
571573
572− if (max_samples == 0) {
574+ if (column_max_samples == 0) {
573575 av_log(ctx, AV_LOG_ERROR, "Too few samples\n");
574576 return AVERROR(EINVAL);
575577 }
576578
577− av_log(ctx, AV_LOG_DEBUG, "Create frame averaging %"PRId64" samples per column\n", max_samples);
579+ av_log(ctx, AV_LOG_DEBUG, "Create frame averaging %"PRId64" samples per column\n", column_max_samples);
578580
579581 memset(sum, 0, nb_channels);
580582
@@ -584,11 +586,13 @@ static int push_single_pic(AVFilterLink *outlink) · 3 unmodified lines
584586 const int16_t *p = (const int16_t *)frame->data[0];
585587
586588 for (i = 0; i < frame->nb_samples; i++) {
589+ int64_t max_samples = col == outlink->w - 1 ? last_column_samples: column_max_samples;
587590 int ch;
588591
589592 for (ch = 0; ch < nb_channels; ch++)
590593 sum[ch] += abs(p[ch + i*nb_channels]) << 1;
591− if (n++ == max_samples) {
594+ n++;
595+ if (n == max_samples) {
592596 for (ch = 0; ch < nb_channels; ch++) {
593597 int16_t sample = sum[ch] / max_samples;
594598 uint8_t *buf = out->data[0] + col * pixstep;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t