@@ -1507,6 +1507,7 @@ frei0r_src_filter_deps="frei0r dlopen strtok_r"

 hqdn3d_filter_deps="gpl"

 movie_filter_deps="avcodec avformat"

 mp_filter_deps="gpl avcodec"

+mptestsrc_filter_deps="gpl"

 negate_filter_deps="lut_filter"

 ocv_filter_deps="libopencv"

 scale_filter_deps="swscale"

@@ -2034,6 +2034,63 @@ movie=/dev/video0:f=video4linux2, scale=180:-1, setpts=PTS-STARTPTS [movie];

 @end example

+@section mptestsrc

+

+Generate various test patterns, as generated by the MPlayer test filter.

+

+The size of the generated video is fixed, and is 256x256.

+This source is useful in particular for testing encoding features.

+

+This source accepts an optional sequence of @var{key}=@var{value} pairs,

+separated by ":". The description of the accepted options follows.

+

+@table @option

+

+@item rate, r

+Specify the frame rate of the sourced video, as the number of frames

+generated per second. It has to be a string in the format

+@var{frame_rate_num}/@var{frame_rate_den}, an integer number, a float

+number or a valid video frame rate abbreviation. The default value is

+"25".

+

+@item duration, d

+Set the video duration of the sourced video. The accepted syntax is:

+@example

+[-]HH[:MM[:SS[.m...]]]

+[-]S+[.m...]

+@end example

+See also the function @code{av_parse_time()}.

+

+If not specified, or the expressed duration is negative, the video is

+supposed to be generated forever.

+

+@item test, t

+

+Set the number or the name of the test to perform. Supported tests are:

+@table @option

+@item dc_luma

+@item dc_chroma

+@item freq_luma

+@item freq_chroma

+@item amp_luma

+@item amp_chroma

+@item cbp

+@item mv

+@item ring1

+@item ring2

+@item all

+@end table

+

+Default value is "all", which will cycle through the list of all tests.

+@end table

+

+For example the following:

+@example

+testsrc=t=dc_luma

+@end example

+

+will generate a "dc_luma" test pattern.

+

 @section nullsrc

 Null video source, never return images. It is mainly useful as a

@@ -69,6 +69,7 @@ OBJS-$(CONFIG_BUFFER_FILTER)                 += vsrc_buffer.o

 OBJS-$(CONFIG_COLOR_FILTER)                  += vsrc_color.o

 OBJS-$(CONFIG_FREI0R_SRC_FILTER)             += vf_frei0r.o

 OBJS-$(CONFIG_MOVIE_FILTER)                  += vsrc_movie.o

+OBJS-$(CONFIG_MPTESTSRC_FILTER)              += vsrc_mptestsrc.o

 OBJS-$(CONFIG_NULLSRC_FILTER)                += vsrc_nullsrc.o

 OBJS-$(CONFIG_RGBTESTSRC_FILTER)             += vsrc_testsrc.o

 OBJS-$(CONFIG_TESTSRC_FILTER)                += vsrc_testsrc.o

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

     REGISTER_FILTER (COLOR,       color,       vsrc);

     REGISTER_FILTER (FREI0R,      frei0r_src,  vsrc);

     REGISTER_FILTER (MOVIE,       movie,       vsrc);

+    REGISTER_FILTER (MPTESTSRC,   mptestsrc,   vsrc);

     REGISTER_FILTER (NULLSRC,     nullsrc,     vsrc);

     REGISTER_FILTER (RGBTESTSRC,  rgbtestsrc,  vsrc);

     REGISTER_FILTER (TESTSRC,     testsrc,     vsrc);

@@ -29,8 +29,8 @@

 #include "libavutil/rational.h"

 #define LIBAVFILTER_VERSION_MAJOR  2

-#define LIBAVFILTER_VERSION_MINOR 28

-#define LIBAVFILTER_VERSION_MICRO  1

+#define LIBAVFILTER_VERSION_MINOR 29

+#define LIBAVFILTER_VERSION_MICRO  0

 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \

                                                LIBAVFILTER_VERSION_MINOR, \

new file mode 100644

@@ -0,0 +1,392 @@

+/*

+ * Copyright (c) 2002 Michael Niedermayer <michaelni@gmx.at>

+ *

+ * This file is part of FFmpeg.

+ *

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

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation; either version 2 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 General Public License for more details.

+ *

+ * You should have received a copy of the GNU 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.

+ */

+

+/**

+ * @file

+ * MP test source, ported from MPlayer libmpcodecs/vf_test.c

+ */

+

+#include "libavutil/avstring.h"

+#include "libavutil/opt.h"

+#include "libavutil/parseutils.h"

+#include "libavutil/pixdesc.h"

+#include "avfilter.h"

+

+#define WIDTH 512

+#define HEIGHT 512

+

+enum test_type {

+    TEST_DC_LUMA,

+    TEST_DC_CHROMA,

+    TEST_FREQ_LUMA,

+    TEST_FREQ_CHROMA,

+    TEST_AMP_LUMA,

+    TEST_AMP_CHROMA,

+    TEST_CBP,

+    TEST_MV,

+    TEST_RING1,

+    TEST_RING2,

+    TEST_ALL,

+    TEST_NB

+};

+

+typedef struct MPTestContext {

+    const AVClass *class;

+    unsigned int frame_nb;

+    AVRational time_base;

+    int64_t pts, max_pts;

+    int hsub, vsub;

+    char *size, *rate, *duration;

+    enum test_type test;

+} MPTestContext;

+

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

+

+static const AVOption mptestsrc_options[]= {

+    { "rate",     "set video rate",     OFFSET(rate),     FF_OPT_TYPE_STRING, {.str = "25"},      0, 0 },

+    { "r",        "set video rate",     OFFSET(rate),     FF_OPT_TYPE_STRING, {.str = "25"},      0, 0 },

+    { "duration", "set video duration", OFFSET(duration), FF_OPT_TYPE_STRING, {.str = NULL},      0, 0 },

+    { "d",        "set video duration", OFFSET(duration), FF_OPT_TYPE_STRING, {.str = NULL},      0, 0 },

+

+    { "test", "set test to perform", OFFSET(test),  FF_OPT_TYPE_INT,   {.dbl=TEST_ALL}, 0, INT_MAX, 0, "test" },

+    { "t",    "set test to perform", OFFSET(test),  FF_OPT_TYPE_INT,   {.dbl=TEST_ALL}, 0, INT_MAX, 0, "test" },

+    { "dc_luma",     "", 0, FF_OPT_TYPE_CONST, {.dbl=TEST_DC_LUMA},     INT_MIN, INT_MAX, 0, "test" },

+    { "dc_chroma",   "", 0, FF_OPT_TYPE_CONST, {.dbl=TEST_DC_CHROMA},   INT_MIN, INT_MAX, 0, "test" },

+    { "freq_luma",   "", 0, FF_OPT_TYPE_CONST, {.dbl=TEST_FREQ_LUMA},   INT_MIN, INT_MAX, 0, "test" },

+    { "freq_chroma", "", 0, FF_OPT_TYPE_CONST, {.dbl=TEST_FREQ_CHROMA}, INT_MIN, INT_MAX, 0, "test" },

+    { "amp_luma",    "", 0, FF_OPT_TYPE_CONST, {.dbl=TEST_AMP_LUMA},    INT_MIN, INT_MAX, 0, "test" },

+    { "amp_chroma",  "", 0, FF_OPT_TYPE_CONST, {.dbl=TEST_AMP_CHROMA},  INT_MIN, INT_MAX, 0, "test" },

+    { "cbp",         "", 0, FF_OPT_TYPE_CONST, {.dbl=TEST_CBP},         INT_MIN, INT_MAX, 0, "test" },

+    { "mv",          "", 0, FF_OPT_TYPE_CONST, {.dbl=TEST_MV},          INT_MIN, INT_MAX, 0, "test" },

+    { "ring1",       "", 0, FF_OPT_TYPE_CONST, {.dbl=TEST_RING1},       INT_MIN, INT_MAX, 0, "test" },

+    { "ring2",       "", 0, FF_OPT_TYPE_CONST, {.dbl=TEST_RING2},       INT_MIN, INT_MAX, 0, "test" },

+    { "all",         "", 0, FF_OPT_TYPE_CONST, {.dbl=TEST_ALL},         INT_MIN, INT_MAX, 0, "test" },

+

+    { NULL },

+};

+

+static const char *mptestsrc_get_name(void *ctx)

+{

+    return "mptestsrc";

+}

+

+static const AVClass mptestsrc_class = {

+    "MPTestContext",

+    mptestsrc_get_name,

+    mptestsrc_options

+};

+

+static double c[64];

+

+static void init_idct(void)

+{

+    int i, j;

+

+    for (i = 0; i < 8; i++) {

+        double s = i == 0 ? sqrt(0.125) : 0.5;

+

+        for (j = 0; j < 8; j++)

+            c[i*8+j] = s*cos((M_PI/8.0)*i*(j+0.5));

+    }

+}

+

+static void idct(uint8_t *dst, int dst_linesize, int src[64])

+{

+    int i, j, k;

+    double tmp[64];

+

+    for (i = 0; i < 8; i++) {

+        for (j = 0; j < 8; j++) {

+            double sum = 0.0;

+

+            for (k = 0; k < 8; k++)

+                sum += c[k*8+j] * src[8*i+k];

+

+            tmp[8*i+j] = sum;

+        }

+    }

+

+    for (j = 0; j < 8; j++) {

+        for (i = 0; i < 8; i++) {

+            double sum = 0.0;

+

+            for (k = 0; k < 8; k++)

+                sum += c[k*8+i]*tmp[8*k+j];

+

+            dst[dst_linesize*i + j] = av_clip((int)floor(sum+0.5), 0, 255);

+        }

+    }

+}

+

+static void draw_dc(uint8_t *dst, int dst_linesize, int color, int w, int h)

+{

+    int x, y;

+

+    for (y = 0; y < h; y++)

+        for (x = 0; x < w; x++)

+            dst[x + y*dst_linesize] = color;

+}

+

+static void draw_basis(uint8_t *dst, int dst_linesize, int amp, int freq, int dc)

+{

+    int src[64];

+

+    memset(src, 0, 64*sizeof(int));

+    src[0] = dc;

+    if (amp)

+        src[freq] = amp;

+    idct(dst, dst_linesize, src);

+}

+

+static void draw_cbp(uint8_t *dst[3], int dst_linesize[3], int cbp, int amp, int dc)

+{

+    if (cbp&1)  draw_basis(dst[0]                    , dst_linesize[0], amp, 1, dc);

+    if (cbp&2)  draw_basis(dst[0]+8                  , dst_linesize[0], amp, 1, dc);

+    if (cbp&4)  draw_basis(dst[0]+  8*dst_linesize[0], dst_linesize[0], amp, 1, dc);

+    if (cbp&8)  draw_basis(dst[0]+8+8*dst_linesize[0], dst_linesize[0], amp, 1, dc);

+    if (cbp&16) draw_basis(dst[1]                    , dst_linesize[1], amp, 1, dc);

+    if (cbp&32) draw_basis(dst[2]                    , dst_linesize[2], amp, 1, dc);

+}

+

+static void dc_test(uint8_t *dst, int dst_linesize, int w, int h, int off)

+{

+    const int step = FFMAX(256/(w*h/256), 1);

+    int x, y, color = off;

+

+    for (y = 0; y < h; y += 16) {

+        for (x = 0; x < w; x += 16) {

+            draw_dc(dst + x + y*dst_linesize, dst_linesize, color, 8, 8);

+            color += step;

+        }

+    }

+}

+

+static void freq_test(uint8_t *dst, int dst_linesize, int off)

+{

+    int x, y, freq = 0;

+

+    for (y = 0; y < 8*16; y += 16) {

+        for (x = 0; x < 8*16; x += 16) {

+            draw_basis(dst + x + y*dst_linesize, dst_linesize, 4*(96+off), freq, 128*8);

+            freq++;

+        }

+    }

+}

+

+static void amp_test(uint8_t *dst, int dst_linesize, int off)

+{

+    int x, y, amp = off;

+

+    for (y = 0; y < 16*16; y += 16) {

+        for (x = 0; x < 16*16; x += 16) {

+            draw_basis(dst + x + y*dst_linesize, dst_linesize, 4*amp, 1, 128*8);

+            amp++;

+        }

+    }

+}

+

+static void cbp_test(uint8_t *dst[3], int dst_linesize[3], int off)

+{

+    int x, y, cbp = 0;

+

+    for (y = 0; y < 16*8; y += 16) {

+        for (x = 0; x < 16*8; x += 16) {

+            uint8_t *dst1[3];

+            dst1[0] = dst[0] + x*2 + y*2*dst_linesize[0];

+            dst1[1] = dst[1] + x   + y*  dst_linesize[1];

+            dst1[2] = dst[2] + x   + y*  dst_linesize[2];

+

+            draw_cbp(dst1, dst_linesize, cbp, (64+off)*4, 128*8);

+            cbp++;

+        }

+    }

+}

+

+static void mv_test(uint8_t *dst, int dst_linesize, int off)

+{

+    int x, y;

+

+    for (y = 0; y < 16*16; y++) {

+        if (y&16)

+            continue;

+        for (x = 0; x < 16*16; x++)

+            dst[x + y*dst_linesize] = x + off*8/(y/32+1);

+    }

+}

+

+static void ring1_test(uint8_t *dst, int dst_linesize, int off)

+{

+    int x, y, color = 0;

+

+    for (y = off; y < 16*16; y += 16) {

+        for (x = off; x < 16*16; x += 16) {

+            draw_dc(dst + x + y*dst_linesize, dst_linesize, ((x+y)&16) ? color : -color, 16, 16);

+            color++;

+        }

+    }

+}

+

+static void ring2_test(uint8_t *dst, int dst_linesize, int off)

+{

+    int x, y;

+

+    for (y = 0; y < 16*16; y++) {

+        for (x = 0; x < 16*16; x++) {

+            double d = sqrt((x-8*16)*(x-8*16) + (y-8*16)*(y-8*16));

+            double r = d/20 - (int)(d/20);

+            if (r < off/30.0) {

+                dst[x + y*dst_linesize]     = 255;

+                dst[x + y*dst_linesize+256] = 0;

+            } else {

+                dst[x + y*dst_linesize]     = x;

+                dst[x + y*dst_linesize+256] = x;

+            }

+        }

+    }

+}

+

+static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)

+{

+    MPTestContext *test = ctx->priv;

+    AVRational frame_rate_q;

+    int64_t duration = -1;

+    int ret;

+

+    test->class = &mptestsrc_class;

+    av_opt_set_defaults2(test, 0, 0);

+

+    if ((ret = (av_set_options_string(test, args, "=", ":"))) < 0) {

+        av_log(ctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args);

+        return ret;

+    }

+

+    if ((ret = av_parse_video_rate(&frame_rate_q, test->rate)) < 0 ||

+        frame_rate_q.den <= 0 || frame_rate_q.num <= 0) {

+        av_log(ctx, AV_LOG_ERROR, "Invalid frame rate: '%s'\n", test->rate);

+        return ret;

+    }

+

+    if ((test->duration) && (ret = av_parse_time(&duration, test->duration, 1)) < 0) {

+        av_log(ctx, AV_LOG_ERROR, "Invalid duration: '%s'\n", test->duration);

+        return ret;

+    }

+

+    test->time_base.num = frame_rate_q.den;

+    test->time_base.den = frame_rate_q.num;

+    test->max_pts = duration >= 0 ?

+        av_rescale_q(duration, AV_TIME_BASE_Q, test->time_base) : -1;

+    test->frame_nb = 0;

+    test->pts = 0;

+

+    av_log(ctx, AV_LOG_INFO, "rate:%d/%d duration:%f\n",

+           frame_rate_q.num, frame_rate_q.den,

+           duration < 0 ? -1 : test->max_pts * av_q2d(test->time_base));

+    init_idct();

+

+    return 0;

+}

+

+static int config_props(AVFilterLink *outlink)

+{

+    AVFilterContext *ctx = outlink->src;

+    MPTestContext *test = ctx->priv;

+    const AVPixFmtDescriptor *pix_desc = &av_pix_fmt_descriptors[outlink->format];

+

+    test->hsub = pix_desc->log2_chroma_w;

+    test->vsub = pix_desc->log2_chroma_h;

+

+    outlink->w = WIDTH;

+    outlink->h = HEIGHT;

+    outlink->time_base = test->time_base;

+

+    return 0;

+}

+

+static int query_formats(AVFilterContext *ctx)

+{

+    static const enum PixelFormat pix_fmts[] = {

+        PIX_FMT_YUV420P, PIX_FMT_NONE

+    };

+

+    avfilter_set_common_pixel_formats(ctx, avfilter_make_format_list(pix_fmts));

+    return 0;

+}

+

+static int request_frame(AVFilterLink *outlink)

+{

+    MPTestContext *test = outlink->src->priv;

+    AVFilterBufferRef *picref;

+    int w = WIDTH, h = HEIGHT, ch = h>>test->vsub;

+    unsigned int frame = test->frame_nb;

+    enum test_type tt = test->test;

+

+    if (test->max_pts >= 0 && test->pts > test->max_pts)

+        return AVERROR_EOF;

+    picref = avfilter_get_video_buffer(outlink, AV_PERM_WRITE, w, h);

+    picref->pts = test->pts++;

+

+    // clean image

+    memset(picref->data[0], 0,   picref->linesize[0] * h);

+    memset(picref->data[1], 128, picref->linesize[1] * ch);

+    memset(picref->data[2], 128, picref->linesize[2] * ch);

+

+    if (tt == TEST_ALL && frame%30) /* draw a black frame at the beginning of each test */

+        tt = (frame/30)%(TEST_NB-1);

+

+    switch (tt) {

+    case TEST_DC_LUMA:       dc_test(picref->data[0], picref->linesize[0], 256, 256, frame%30); break;

+    case TEST_DC_CHROMA:     dc_test(picref->data[1], picref->linesize[1], 256, 256, frame%30); break;

+    case TEST_FREQ_LUMA:   freq_test(picref->data[0], picref->linesize[0], frame%30); break;

+    case TEST_FREQ_CHROMA: freq_test(picref->data[1], picref->linesize[1], frame%30); break;

+    case TEST_AMP_LUMA:     amp_test(picref->data[0], picref->linesize[0], frame%30); break;

+    case TEST_AMP_CHROMA:   amp_test(picref->data[1], picref->linesize[1], frame%30); break;

+    case TEST_CBP:          cbp_test(picref->data   , picref->linesize   , frame%30); break;

+    case TEST_MV:            mv_test(picref->data[0], picref->linesize[0], frame%30); break;

+    case TEST_RING1:      ring1_test(picref->data[0], picref->linesize[0], frame%30); break;

+    case TEST_RING2:      ring2_test(picref->data[0], picref->linesize[0], frame%30); break;

+    }

+

+    test->frame_nb++;

+

+    avfilter_start_frame(outlink, avfilter_ref_buffer(picref, ~0));

+    avfilter_draw_slice(outlink, 0, picref->video->h, 1);

+    avfilter_end_frame(outlink);

+    avfilter_unref_buffer(picref);

+

+    return 0;

+}

+

+AVFilter avfilter_vsrc_mptestsrc = {

+    .name      = "mptestsrc",

+    .description = NULL_IF_CONFIG_SMALL("Generate various test pattern."),

+    .priv_size = sizeof(MPTestContext),

+    .init      = init,

+

+    .query_formats   = query_formats,

+

+    .inputs    = (AVFilterPad[]) {{ .name = NULL}},

+

+    .outputs   = (AVFilterPad[]) {{ .name = "default",

+                                    .type = AVMEDIA_TYPE_VIDEO,

+                                    .config_props = config_props,

+                                    .request_frame = request_frame,

+                                    .config_props  = config_props, },

+                                  { .name = NULL }},

+};