@@ -32,6 +32,7 @@ version <next>:

 - OS X VideoToolbox support

 - aphasemeter filter

 - showfreqs filter

+- vectorscope filter

 version 2.7:

@@ -10497,6 +10497,44 @@ Force a constant quantization parameter. If not set, the filter will use the QP

 from the video stream (if available).

 @end table

+@section vectorscope

+

+Display 2 color component values in the two dimensional graph (which is called

+a vectorscope).

+

+This filter accepts the following options:

+

+@table @option

+@item mode

+Set vectorscope mode.

+

+It accepts the following values:

+@table @samp

+@item gray

+Gray values are displayed on graph, higher brightness means more pixels have

+same component color value on location in graph. This is the default mode.

+

+@item color

+Gray values are displayed on graph. Surrounding pixels values which are not

+present in video frame are drawn in gradient of 2 color components which are

+set by option @code{x} and @code{y}.

+

+@item color2

+Actual color components values present in video frame are displayed on graph.

+

+@item color3

+Similar as color2 but higher frequency of same values @code{x} and @code{y}

+on graph increases value of another color component, which is luminance by

+default values of @code{x} and @code{y}.

+@end table

+

+@item x

+Set which color component will be represented on X-axis. Default is @code{1}.

+

+@item y

+Set which color component will be represented on Y-axis. Default is @code{2}.

+@end table

+

 @anchor{vidstabdetect}

 @section vidstabdetect

@@ -226,6 +226,7 @@ OBJS-$(CONFIG_TRANSPOSE_FILTER)              += vf_transpose.o

 OBJS-$(CONFIG_TRIM_FILTER)                   += trim.o

 OBJS-$(CONFIG_UNSHARP_FILTER)                += vf_unsharp.o

 OBJS-$(CONFIG_USPP_FILTER)                   += vf_uspp.o

+OBJS-$(CONFIG_VECTORSCOPE_FILTER)            += vf_vectorscope.o

 OBJS-$(CONFIG_VFLIP_FILTER)                  += vf_vflip.o

 OBJS-$(CONFIG_VIDSTABDETECT_FILTER)          += vidstabutils.o vf_vidstabdetect.o

 OBJS-$(CONFIG_VIDSTABTRANSFORM_FILTER)       += vidstabutils.o vf_vidstabtransform.o

@@ -241,6 +241,7 @@ void avfilter_register_all(void)

     REGISTER_FILTER(TRIM,           trim,           vf);

     REGISTER_FILTER(UNSHARP,        unsharp,        vf);

     REGISTER_FILTER(USPP,           uspp,           vf);

+    REGISTER_FILTER(VECTORSCOPE,    vectorscope,    vf);

     REGISTER_FILTER(VFLIP,          vflip,          vf);

     REGISTER_FILTER(VIDSTABDETECT,  vidstabdetect,  vf);

     REGISTER_FILTER(VIDSTABTRANSFORM, vidstabtransform, vf);

@@ -30,7 +30,7 @@

 #include "libavutil/version.h"

 #define LIBAVFILTER_VERSION_MAJOR  5

-#define LIBAVFILTER_VERSION_MINOR  35

+#define LIBAVFILTER_VERSION_MINOR  36

 #define LIBAVFILTER_VERSION_MICRO 100

 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \

@@ -179,6 +179,7 @@ static int config_output(AVFilterLink *outlink)

         break;

     case MODE_COLOR:

     case MODE_COLOR2:

+        av_log(ctx, AV_LOG_WARNING, "This mode is deprecated, use vectorscope filter instead.");

         outlink->h = outlink->w = 256;

         break;

     default:

new file mode 100644

@@ -0,0 +1,293 @@

+/*

+ * Copyright (c) 2015 Paul B Mahol

+ *

+ * This file is part of FFmpeg.

+ *

+ * FFmpeg is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU Lesser General Public

+ * License as published by the Free Software Foundation; either

+ * version 2.1 of the License, or (at your option) any later version.

+ *

+ * FFmpeg is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+ * Lesser General Public License for more details.

+ *

+ * You should have received a copy of the GNU Lesser General Public

+ * License along with FFmpeg; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+ */

+

+#include "libavutil/avassert.h"

+#include "libavutil/opt.h"

+#include "libavutil/parseutils.h"

+#include "libavutil/pixdesc.h"

+#include "avfilter.h"

+#include "formats.h"

+#include "internal.h"

+#include "video.h"

+

+enum VectorscopeMode {

+    GRAY,

+    COLOR,

+    COLOR2,

+    COLOR3,

+    MODE_NB

+};

+

+typedef struct VectorscopeContext {

+    const AVClass *class;

+    int mode;

+    const uint8_t *bg_color;

+    int x, y, pd;

+    int is_yuv;

+} VectorscopeContext;

+

+#define OFFSET(x) offsetof(VectorscopeContext, x)

+#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM

+

+static const AVOption vectorscope_options[] = {

+    { "mode", "set vectorscope mode", OFFSET(mode), AV_OPT_TYPE_INT, {.i64=0}, 0, MODE_NB-1, FLAGS, "mode"},

+    { "gray",   0, 0, AV_OPT_TYPE_CONST, {.i64=GRAY},   0, 0, FLAGS, "mode" },

+    { "color",  0, 0, AV_OPT_TYPE_CONST, {.i64=COLOR},  0, 0, FLAGS, "mode" },

+    { "color2", 0, 0, AV_OPT_TYPE_CONST, {.i64=COLOR2}, 0, 0, FLAGS, "mode" },

+    { "color3", 0, 0, AV_OPT_TYPE_CONST, {.i64=COLOR3}, 0, 0, FLAGS, "mode" },

+    { "x", "set color component on X axis", OFFSET(x), AV_OPT_TYPE_INT, {.i64=1}, 0, 2, FLAGS},

+    { "y", "set color component on Y axis", OFFSET(y), AV_OPT_TYPE_INT, {.i64=2}, 0, 2, FLAGS},

+    { NULL }

+};

+

+AVFILTER_DEFINE_CLASS(vectorscope);

+

+static const enum AVPixelFormat pix_fmts[] = {

+    AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUV444P,

+    AV_PIX_FMT_GBRAP, AV_PIX_FMT_GBRP,

+    AV_PIX_FMT_NONE

+};

+

+static int query_formats(AVFilterContext *ctx)

+{

+    AVFilterFormats *fmts_list;

+

+    fmts_list = ff_make_format_list(pix_fmts);

+    if (!fmts_list)

+        return AVERROR(ENOMEM);

+    return ff_set_common_formats(ctx, fmts_list);

+}

+

+static const uint8_t black_yuva_color[4] = { 0, 127, 127, 0 };

+static const uint8_t black_gbrp_color[4] = { 0, 0, 0, 0 };

+

+static int config_input(AVFilterLink *inlink)

+{

+    VectorscopeContext *s = inlink->dst->priv;

+

+    if (s->mode == GRAY)

+        s->pd = 0;

+    else {

+        if ((s->x == 1 && s->y == 2) || (s->x == 2 && s->y == 1))

+            s->pd = 0;

+        else if ((s->x == 0 && s->y == 2) || (s->x == 2 && s->y == 0))

+            s->pd = 1;

+        else if ((s->x == 0 && s->y == 1) || (s->x == 1 && s->y == 0))

+            s->pd = 2;

+    }

+

+    switch (inlink->format) {

+    case AV_PIX_FMT_GBRAP:

+    case AV_PIX_FMT_GBRP:

+        s->bg_color = black_gbrp_color;

+        break;

+    default:

+        s->bg_color = black_yuva_color;

+    }

+

+    return 0;

+}

+

+static int config_output(AVFilterLink *outlink)

+{

+    VectorscopeContext *s = outlink->src->priv;

+    const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(outlink->format);

+    int depth = desc->comp[0].depth_minus1 + 1;

+

+    s->is_yuv = !(desc->flags & AV_PIX_FMT_FLAG_RGB);

+    outlink->h = outlink->w = 1 << depth;

+    outlink->sample_aspect_ratio = (AVRational){1,1};

+    return 0;

+}

+

+static void vectorscope(VectorscopeContext *s, AVFrame *in, AVFrame *out, int pd)

+{

+    const uint8_t * const *src = (const uint8_t * const *)in->data;

+    const int slinesizex = in->linesize[s->x];

+    const int slinesizey = in->linesize[s->y];

+    const int dlinesize = out->linesize[0];

+    int i, j, px = s->x, py = s->y;

+    const uint8_t *spx = src[px];

+    const uint8_t *spy = src[py];

+    uint8_t **dst = out->data;

+    uint8_t *dpx = dst[px];

+    uint8_t *dpy = dst[py];

+    uint8_t *dpd = dst[pd];

+

+    switch (s->mode) {

+    case COLOR:

+    case GRAY:

+        if (s->is_yuv) {

+            for (i = 0; i < in->height; i++) {

+                const int iwx = i * slinesizex;

+                const int iwy = i * slinesizey;

+                for (j = 0; j < in->width; j++) {

+                    const int x = spx[iwx + j];

+                    const int y = spy[iwy + j];

+                    const int pos = y * dlinesize + x;

+

+                    dpd[pos] = FFMIN(dpd[pos] + 1, 255);

+                    if (dst[3])

+                        dst[3][pos] = 255;

+                }

+            }

+        } else {

+            for (i = 0; i < in->height; i++) {

+                const int iwx = i * slinesizex;

+                const int iwy = i * slinesizey;

+                for (j = 0; j < in->width; j++) {

+                    const int x = spx[iwx + j];

+                    const int y = spy[iwy + j];

+                    const int pos = y * dlinesize + x;

+

+                    dst[0][pos] = FFMIN(dst[0][pos] + 1, 255);

+                    dst[1][pos] = FFMIN(dst[1][pos] + 1, 255);

+                    dst[2][pos] = FFMIN(dst[2][pos] + 1, 255);

+                    if (dst[3])

+                        dst[3][pos] = 255;

+                }

+            }

+        }

+        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) {

+            for (i = 0; i < in->height; i++) {

+                const int iw1 = i * slinesizex;

+                const int iw2 = i * slinesizey;

+                for (j = 0; j < in->width; j++) {

+                    const int x = spx[iw1 + j];

+                    const int y = spy[iw2 + j];

+                    const int pos = y * dlinesize + x;

+

+                    if (!dpd[pos])

+                        dpd[pos] = FFABS(128 - x) + FFABS(128 - y);

+                    dpx[pos] = x;

+                    dpy[pos] = y;

+                    if (dst[3])

+                        dst[3][pos] = 255;

+                }

+            }

+        } else {

+            for (i = 0; i < in->height; i++) {

+                const int iw1 = i * slinesizex;

+                const int iw2 = i * slinesizey;

+                for (j = 0; j < in->width; j++) {

+                    const int x = spx[iw1 + j];

+                    const int y = spy[iw2 + j];

+                    const int pos = y * dlinesize + x;

+

+                    if (!dpd[pos])

+                        dpd[pos] = FFMIN(x + y, 255);

+                    dpx[pos] = x;

+                    dpy[pos] = y;

+                    if (dst[3])

+                        dst[3][pos] = 255;

+                }

+            }

+        }

+        break;

+    case COLOR3:

+        for (i = 0; i < in->height; i++) {

+            const int iw1 = i * slinesizex;

+            const int iw2 = i * slinesizey;

+            for (j = 0; j < in->width; j++) {

+                const int x = spx[iw1 + j];

+                const int y = spy[iw2 + j];

+                const int pos = y * dlinesize + x;

+

+                dpd[pos] = FFMIN(255, dpd[pos] + 1);

+                dpx[pos] = x;

+                dpy[pos] = y;

+                if (dst[3])

+                    dst[3][pos] = 255;

+            }

+        }

+        break;

+    default:

+        av_assert0(0);

+    }

+}

+

+static int filter_frame(AVFilterLink *inlink, AVFrame *in)

+{

+    AVFilterContext *ctx  = inlink->dst;

+    VectorscopeContext *s = ctx->priv;

+    AVFilterLink *outlink = ctx->outputs[0];

+    AVFrame *out;

+    uint8_t **dst;;

+    int i, k;

+

+    out = ff_get_video_buffer(outlink, outlink->w, outlink->h);

+    if (!out) {

+        av_frame_free(&in);

+        return AVERROR(ENOMEM);

+    }

+    out->pts = in->pts;

+    dst = out->data;

+

+    for (k = 0; k < 4 && dst[k]; k++)

+        for (i = 0; i < outlink->h ; i++)

+            memset(dst[k] + i * out->linesize[k],

+                   s->mode == COLOR && k == s->pd ? 0 : s->bg_color[k], outlink->w);

+

+    vectorscope(s, in, out, s->pd);

+

+    av_frame_free(&in);

+    return ff_filter_frame(outlink, out);

+}

+

+static const AVFilterPad inputs[] = {

+    {

+        .name         = "default",

+        .type         = AVMEDIA_TYPE_VIDEO,

+        .filter_frame = filter_frame,

+        .config_props = config_input,

+    },

+    { NULL }

+};

+

+static const AVFilterPad outputs[] = {

+    {

+        .name         = "default",

+        .type         = AVMEDIA_TYPE_VIDEO,

+        .config_props = config_output,

+    },

+    { NULL }

+};

+

+AVFilter ff_vf_vectorscope = {

+    .name          = "vectorscope",

+    .description   = NULL_IF_CONFIG_SMALL("Video vectorscope."),

+    .priv_size     = sizeof(VectorscopeContext),

+    .priv_class    = &vectorscope_class,

+    .query_formats = query_formats,

+    .inputs        = inputs,

+    .outputs       = outputs,

+};