From dead1964ea8c4a87adb098c2c1abb2778b01831f Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Sun, 30 Aug 2015 13:34:17 +0000 Subject: [PATCH] avfilter/vf_vectorscope: make color mode more useful Signed-off-by: Paul B Mahol --- libavfilter/vf_vectorscope.c | 22 ++++++++++++---------- tests/ref/fate/filter-vectorscope_color | 6 +++--- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/libavfilter/vf_vectorscope.c b/libavfilter/vf_vectorscope.c index b1967a2fe0..5b0937699d 100644 --- a/libavfilter/vf_vectorscope.c +++ b/libavfilter/vf_vectorscope.c @@ -305,16 +305,6 @@ static void vectorscope(VectorscopeContext *s, AVFrame *in, AVFrame *out, int pd } } } - if (s->mode == COLOR) { - for (i = 0; i < out->height; i++) { - for (j = 0; j < out->width; j++) { - if (!dpd[i * out->linesize[pd] + j]) { - dpx[i * out->linesize[px] + j] = j; - dpy[i * out->linesize[py] + j] = i; - } - } - } - } break; case COLOR2: if (s->is_yuv) { @@ -393,6 +383,18 @@ static void vectorscope(VectorscopeContext *s, AVFrame *in, AVFrame *out, int pd } envelope(s, out); + + if (s->mode == COLOR) { + for (i = 0; i < out->height; i++) { + for (j = 0; j < out->width; j++) { + if (!dpd[i * out->linesize[pd] + j]) { + dpx[i * out->linesize[px] + j] = j; + dpy[i * out->linesize[py] + j] = i; + dpd[i * out->linesize[pd] + j] = 128; + } + } + } + } } static int filter_frame(AVFilterLink *inlink, AVFrame *in) diff --git a/tests/ref/fate/filter-vectorscope_color b/tests/ref/fate/filter-vectorscope_color index 40165b6b0f..3d184f6ca1 100644 --- a/tests/ref/fate/filter-vectorscope_color +++ b/tests/ref/fate/filter-vectorscope_color @@ -1,4 +1,4 @@ #tb 0: 1/25 -0, 0, 0, 1, 196608, 0x9d705c63 -0, 1, 1, 1, 196608, 0x9fbf6f2c -0, 2, 2, 1, 196608, 0x257b7290 +0, 0, 0, 1, 196608, 0x1890aa30 +0, 1, 1, 1, 196608, 0xa490acf9 +0, 2, 2, 1, 196608, 0x404a775d