diff options
| author | Paul B Mahol <onemda@gmail.com> | 2018-10-24 17:39:51 +0200 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2018-10-24 17:39:51 +0200 |
| commit | bc940cf95c3b31de40fde44884c3ee1f6129973a (patch) | |
| tree | bb99ba73364a940652af51f21ff32ef802820fca | |
| parent | f9d4126f28822f1a33c917030db4115b1364807b (diff) | |
| download | ffmpeg-bc940cf95c3b31de40fde44884c3ee1f6129973a.tar.gz | |
avfilter/vf_datascope: fix rgba mapping for oscilloscope filter output
| -rw-r--r-- | libavfilter/vf_datascope.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavfilter/vf_datascope.c b/libavfilter/vf_datascope.c index 6bcc18e85e..c9039a60f6 100644 --- a/libavfilter/vf_datascope.c +++ b/libavfilter/vf_datascope.c @@ -802,8 +802,8 @@ static void draw_trace8(OscilloscopeContext *s, AVFrame *frame) if ((1 << c) & s->components) { int x = i * s->width / s->nb_values; int px = (i - 1) * s->width / s->nb_values; - int py = s->height - s->values[i-1].p[c] * s->height / 256; - int y = s->height - s->values[i].p[c] * s->height / 256; + int py = s->height - s->values[i-1].p[s->rgba_map[c]] * s->height / 256; + int y = s->height - s->values[i].p[s->rgba_map[c]] * s->height / 256; draw_line(&s->draw, s->ox + x, s->oy + y, s->ox + px, s->oy + py, frame, s->colors[c]); } @@ -821,8 +821,8 @@ static void draw_trace16(OscilloscopeContext *s, AVFrame *frame) if ((1 << c) & s->components) { int x = i * s->width / s->nb_values; int px = (i - 1) * s->width / s->nb_values; - int py = s->height - s->values[i-1].p[c] * s->height / s->max; - int y = s->height - s->values[i].p[c] * s->height / s->max; + int py = s->height - s->values[i-1].p[s->rgba_map[c]] * s->height / s->max; + int y = s->height - s->values[i].p[s->rgba_map[c]] * s->height / s->max; draw_line(&s->draw, s->ox + x, s->oy + y, s->ox + px, s->oy + py, frame, s->colors[c]); } @@ -996,9 +996,9 @@ static int oscilloscope_filter_frame(AVFilterLink *inlink, AVFrame *frame) for (i = 0; i < s->nb_values; i++) { for (c = 0; c < s->nb_comps; c++) { if ((1 << c) & s->components) { - max[c] = FFMAX(max[c], s->values[i].p[c]); - min[c] = FFMIN(min[c], s->values[i].p[c]); - average[c] += s->values[i].p[c]; + max[c] = FFMAX(max[c], s->values[i].p[s->rgba_map[c]]); + min[c] = FFMIN(min[c], s->values[i].p[s->rgba_map[c]]); + average[c] += s->values[i].p[s->rgba_map[c]]; } } } @@ -1013,7 +1013,7 @@ static int oscilloscope_filter_frame(AVFilterLink *inlink, AVFrame *frame) const char yuva[4] = { 'Y', 'U', 'V', 'A' }; char text[128]; - snprintf(text, sizeof(text), "%c avg:%.1f min:%d max:%d\n", s->is_rgb ? rgba[c] : yuva[c], average[s->rgba_map[c]], min[s->rgba_map[c]], max[s->rgba_map[c]]); + snprintf(text, sizeof(text), "%c avg:%.1f min:%d max:%d\n", s->is_rgb ? rgba[c] : yuva[c], average[c], min[c], max[c]); draw_text(&s->draw, frame, &s->white, s->ox + 2 + 280 * i++, s->oy + s->height + 4, text, 0); } } |