Fixes #5931.
Unified · Split
| @@ -559,7 +559,9 @@ static int push_single_pic(AVFilterLink *outlink) · 558 unmodified lines | |||
| 559 | AVFilterContext *ctx = outlink->src; | 559 | AVFilterContext *ctx = outlink->src; |
| 560 | AVFilterLink *inlink = ctx->inputs[0]; | 560 | AVFilterLink *inlink = ctx->inputs[0]; |
| 561 | ShowWavesContext *showwaves = ctx->priv; | 561 | 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; | ||
| 563 | AVFrame *out = showwaves->outpicref; | 565 | AVFrame *out = showwaves->outpicref; |
| 564 | struct frame_node *node; | 566 | struct frame_node *node; |
| 565 | const int nb_channels = inlink->channels; | 567 | const int nb_channels = inlink->channels; |
| @@ -569,12 +571,12 @@ static int push_single_pic(AVFilterLink *outlink) · 3 unmodified lines | |||
| 569 | int col = 0; | 571 | int col = 0; |
| 570 | int64_t *sum = showwaves->sum; | 572 | int64_t *sum = showwaves->sum; |
| 571 | 573 | ||
| 572 | if (max_samples == 0) { | 574 | if (column_max_samples == 0) { |
| 573 | av_log(ctx, AV_LOG_ERROR, "Too few samples\n"); | 575 | av_log(ctx, AV_LOG_ERROR, "Too few samples\n"); |
| 574 | return AVERROR(EINVAL); | 576 | return AVERROR(EINVAL); |
| 575 | } | 577 | } |
| 576 | 578 | ||
| 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); |
| 578 | 580 | ||
| 579 | memset(sum, 0, nb_channels); | 581 | memset(sum, 0, nb_channels); |
| 580 | 582 | ||
| @@ -584,11 +586,13 @@ static int push_single_pic(AVFilterLink *outlink) · 3 unmodified lines | |||
| 584 | const int16_t *p = (const int16_t *)frame->data[0]; | 586 | const int16_t *p = (const int16_t *)frame->data[0]; |
| 585 | 587 | ||
| 586 | for (i = 0; i < frame->nb_samples; i++) { | 588 | for (i = 0; i < frame->nb_samples; i++) { |
| 589 | int64_t max_samples = col == outlink->w - 1 ? last_column_samples: column_max_samples; | ||
| 587 | int ch; | 590 | int ch; |
| 588 | 591 | ||
| 589 | for (ch = 0; ch < nb_channels; ch++) | 592 | for (ch = 0; ch < nb_channels; ch++) |
| 590 | sum[ch] += abs(p[ch + i*nb_channels]) << 1; | 593 | sum[ch] += abs(p[ch + i*nb_channels]) << 1; |
| 591 | if (n++ == max_samples) { | 594 | n++; |
| 595 | if (n == max_samples) { | ||
| 592 | for (ch = 0; ch < nb_channels; ch++) { | 596 | for (ch = 0; ch < nb_channels; ch++) { |
| 593 | int16_t sample = sum[ch] / max_samples; | 597 | int16_t sample = sum[ch] / max_samples; |
| 594 | uint8_t *buf = out->data[0] + col * pixstep; | 598 | uint8_t *buf = out->data[0] + col * pixstep; |