[PATCH 2/2] Add pixdesctest filter and corresponding test.

Stefano Sabatini stefano.sabatini-lala
Mon Jun 7 22:31:30 CEST 2010


---
 Makefile                      |    1 +
 doc/libavfilter.texi          |   13 ++++
 libavfilter/Makefile          |    1 +
 libavfilter/allfilters.c      |    1 +
 libavfilter/vf_pixdesctest.c  |  129 +++++++++++++++++++++++++++++++++++++++++
 tests/lavfi-regression.sh     |    8 +++
 tests/ref/lavfi/lavfi_pixdesc |   84 ++++++++++++++++++++++++++
 7 files changed, 237 insertions(+), 0 deletions(-)
 create mode 100644 libavfilter/vf_pixdesctest.c
 create mode 100644 tests/ref/lavfi/lavfi_pixdesc

diff --git a/Makefile b/Makefile
index 4b945f4..404dad9 100644
--- a/Makefile
+++ b/Makefile
@@ -262,6 +262,7 @@ LAVFI_TESTS =           \
     vflip               \
     vflip_crop          \
     vflip_vflip         \
+    lavfi_pixdesc       \
 #   lavfi_pix_fmts      \
 
 ACODEC_TESTS := $(addprefix regtest-, $(ACODEC_TESTS) $(ACODEC_TESTS-yes))
diff --git a/doc/libavfilter.texi b/doc/libavfilter.texi
index 1de27d9..83cae93 100644
--- a/doc/libavfilter.texi
+++ b/doc/libavfilter.texi
@@ -212,6 +212,19 @@ The default value of @var{color} is ``black''.
 
 @end table
 
+ at section pixdesctest
+
+Pixel format descriptor test filter, mainly useful for internal
+testing. The output video should be equal to the input video.
+
+For example:
+ at example
+format=monow, pixdesctest
+end example
+
+can be used to test the monowhite pixel format descriptor definition
+implemented by the pixdesc.h API.
+
 @section scale
 
 Scale the input video to @var{width}:@var{height} and/or convert the image format.
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 2ddf217..e1f5f5c 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -20,6 +20,7 @@ OBJS-$(CONFIG_FORMAT_FILTER)                 += vf_format.o
 OBJS-$(CONFIG_NOFORMAT_FILTER)               += vf_format.o
 OBJS-$(CONFIG_NULL_FILTER)                   += vf_null.o
 OBJS-$(CONFIG_PAD_FILTER)                    += vf_pad.o
+OBJS-$(CONFIG_PIXDESCTEST_FILTER)            += vf_pixdesctest.o
 OBJS-$(CONFIG_PIXELASPECT_FILTER)            += vf_aspect.o
 OBJS-$(CONFIG_SCALE_FILTER)                  += vf_scale.o
 OBJS-$(CONFIG_SLICIFY_FILTER)                += vf_slicify.o
diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c
index e85485c..90be2b4 100644
--- a/libavfilter/allfilters.c
+++ b/libavfilter/allfilters.c
@@ -40,6 +40,7 @@ void avfilter_register_all(void)
     REGISTER_FILTER (NOFORMAT,    noformat,    vf);
     REGISTER_FILTER (NULL,        null,        vf);
     REGISTER_FILTER (PAD,         pad,         vf);
+    REGISTER_FILTER (PIXDESCTEST, pixdesctest, vf);
     REGISTER_FILTER (PIXELASPECT, pixelaspect, vf);
     REGISTER_FILTER (SCALE,       scale,       vf);
     REGISTER_FILTER (SLICIFY,     slicify,     vf);
diff --git a/libavfilter/vf_pixdesctest.c b/libavfilter/vf_pixdesctest.c
new file mode 100644
index 0000000..c3037df
--- /dev/null
+++ b/libavfilter/vf_pixdesctest.c
@@ -0,0 +1,129 @@
+/*
+ * This file is part of FFmpeg.
+ * copyright (C) 2009 Stefano Sabatini
+ *
+ * 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
+ */
+
+/**
+ * @file
+ * pixdesc test filter
+ */
+
+#include "libavutil/pixdesc.h"
+#include "avfilter.h"
+
+typedef struct {
+    const AVPixFmtDescriptor *pix_desc;
+    uint16_t *line;
+} PixdescTestContext;
+
+static av_cold void uninit(AVFilterContext *ctx)
+{
+    PixdescTestContext *priv = ctx->priv;
+    av_freep(&priv->line);
+}
+
+static int config_props(AVFilterLink *inlink)
+{
+    PixdescTestContext *priv = inlink->dst->priv;
+
+    priv->pix_desc = &av_pix_fmt_descriptors[inlink->format];
+
+    if (!(priv->line = av_malloc(sizeof(*priv->line) * inlink->w)))
+        return AVERROR(ENOMEM);
+
+    return 0;
+}
+
+static void start_frame(AVFilterLink *inlink, AVFilterPicRef *picref)
+{
+    PixdescTestContext *priv = inlink->dst->priv;
+    AVFilterLink *outlink    = inlink->dst->outputs[0];
+    AVFilterPicRef *outpicref;
+    int i;
+
+    outlink->outpic = avfilter_get_video_buffer(outlink, AV_PERM_WRITE,
+                                                outlink->w, outlink->h);
+    outpicref = outlink->outpic;
+    outpicref->pts             = picref->pts;
+    outpicref->pos             = picref->pos;
+    outpicref->pixel_aspect    = picref->pixel_aspect;
+    outpicref->interlaced      = picref->interlaced;
+    outpicref->top_field_first = picref->top_field_first;
+
+    for (i = 0; i < 4; i++) {
+        int h = outlink->h;
+        h = i == 1 || i == 2 ? h>>priv->pix_desc->log2_chroma_h : h;
+        if (outpicref->data[i])
+            memset(outpicref->data[i], 0, outpicref->linesize[i] * h);
+    }
+
+    /* copy palette */
+    if (priv->pix_desc->flags & PIX_FMT_PAL)
+        memcpy(outpicref->data[1], outpicref->data[1], 256*4);
+
+    avfilter_start_frame(outlink, avfilter_ref_pic(outpicref, ~0));
+}
+
+static void draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir)
+{
+    PixdescTestContext *priv = inlink->dst->priv;
+    AVFilterPicRef    *inpic = inlink->cur_pic;
+    AVFilterPicRef   *outpic = inlink->dst->outputs[0]->outpic;
+    int i, c, w = inlink->w;
+
+    for (c = 0; c < priv->pix_desc->nb_components; c++) {
+        int w1 = c == 1 || c == 2 ? w>>priv->pix_desc->log2_chroma_w : w;
+        int h1 = c == 1 || c == 2 ? h>>priv->pix_desc->log2_chroma_h : h;
+        int y1 = c == 1 || c == 2 ? y>>priv->pix_desc->log2_chroma_h : y;
+
+        for (i = y1; i < y1 + h1; i++) {
+            read_line(priv->line,
+                      inpic->data,
+                      inpic->linesize,
+                      priv->pix_desc,
+                      0, i, c, w1, 0);
+
+            write_line(priv->line,
+                       outpic->data,
+                       outpic->linesize,
+                       priv->pix_desc,
+                       0, i, c, w1);
+        }
+    }
+
+    avfilter_draw_slice(inlink->dst->outputs[0], y, h, slice_dir);
+}
+
+AVFilter avfilter_vf_pixdesctest = {
+    .name        = "pixdesctest",
+    .description = "Test pixel format definitions.",
+
+    .priv_size = sizeof(PixdescTestContext),
+    .uninit    = uninit,
+
+    .inputs    = (AVFilterPad[]) {{ .name            = "default",
+                                    .type            = AVMEDIA_TYPE_VIDEO,
+                                    .start_frame     = start_frame,
+                                    .draw_slice      = draw_slice,
+                                    .config_props    = config_props,
+                                    .min_perms       = AV_PERM_READ, },
+                                  { .name = NULL}},
+
+    .outputs   = (AVFilterPad[]) {{ .name            = "default",
+                                    .type            = AVMEDIA_TYPE_VIDEO, },
+                                  { .name = NULL}},
+};
diff --git a/tests/lavfi-regression.sh b/tests/lavfi-regression.sh
index ebbc0f3..5b23216 100755
--- a/tests/lavfi-regression.sh
+++ b/tests/lavfi-regression.sh
@@ -86,6 +86,14 @@ if [ -n "$do_lavfi_pix_fmts" ]; then
     done
 fi
 
+if [ -n "$do_lavfi_pixdesc" ]; then
+    pix_fmts="$(ffmpeg -pix_fmts list 2>/dev/null | sed -ne '9,$p' | grep '^IO' | cut -d' ' -f2)"
+    for pix_fmt in $pix_fmts; do
+        do_video_encoding "lavfi_pixdesc-${pix_fmt}.nut" "" \
+            "-vf slicify=random,format=$pix_fmt,pixdesctest -vcodec rawvideo -pix_fmt $pix_fmt"
+    done
+fi
+
 # TODO: add tests for
 # direct rendering,
 # chains with feedback loops
diff --git a/tests/ref/lavfi/lavfi_pixdesc b/tests/ref/lavfi/lavfi_pixdesc
new file mode 100644
index 0000000..552d5ef
--- /dev/null
+++ b/tests/ref/lavfi/lavfi_pixdesc
@@ -0,0 +1,84 @@
+eba2f135a08829387e2f698ff72a2939 *./tests/data/lavfi/lavfi_pixdesc-yuv420p.nut
+7604654 ./tests/data/lavfi/lavfi_pixdesc-yuv420p.nut
+f2569f2b5069a0ee0cecae33de0455e3 *./tests/data/lavfi/lavfi_pixdesc-yuyv422.nut
+10139054 ./tests/data/lavfi/lavfi_pixdesc-yuyv422.nut
+b41eba9651e1b5fe386289b506188105 *./tests/data/lavfi/lavfi_pixdesc-rgb24.nut
+15207903 ./tests/data/lavfi/lavfi_pixdesc-rgb24.nut
+0d0cb38ab3fa0b2ec0865c14f78b217b *./tests/data/lavfi/lavfi_pixdesc-bgr24.nut
+15207903 ./tests/data/lavfi/lavfi_pixdesc-bgr24.nut
+c9bba4529821d796a6ab09f6a5fd355a *./tests/data/lavfi/lavfi_pixdesc-yuv422p.nut
+10139054 ./tests/data/lavfi/lavfi_pixdesc-yuv422p.nut
+0a98447b78fd476aa39686da6a74fa2e *./tests/data/lavfi/lavfi_pixdesc-yuv444p.nut
+15207903 ./tests/data/lavfi/lavfi_pixdesc-yuv444p.nut
+2d9225153c83ee1132397d619d94d1b3 *./tests/data/lavfi/lavfi_pixdesc-yuv410p.nut
+5703854 ./tests/data/lavfi/lavfi_pixdesc-yuv410p.nut
+8b298af3e43348ca1b11eb8a3252ac6c *./tests/data/lavfi/lavfi_pixdesc-yuv411p.nut
+7604654 ./tests/data/lavfi/lavfi_pixdesc-yuv411p.nut
+db08f7f0751900347e6b8649e4164d21 *./tests/data/lavfi/lavfi_pixdesc-gray.nut
+5070254 ./tests/data/lavfi/lavfi_pixdesc-gray.nut
+9251497f3b0634f1165d12d5a289d943 *./tests/data/lavfi/lavfi_pixdesc-monow.nut
+634329 ./tests/data/lavfi/lavfi_pixdesc-monow.nut
+668ebe8b8103b9046b251b2fa8a1d88f *./tests/data/lavfi/lavfi_pixdesc-monob.nut
+634329 ./tests/data/lavfi/lavfi_pixdesc-monob.nut
+32eec78ba51857b16ce9b813a49b7189 *./tests/data/lavfi/lavfi_pixdesc-yuvj420p.nut
+7604654 ./tests/data/lavfi/lavfi_pixdesc-yuvj420p.nut
+0dfa0ed434f73be51428758c69e082cb *./tests/data/lavfi/lavfi_pixdesc-yuvj422p.nut
+10139054 ./tests/data/lavfi/lavfi_pixdesc-yuvj422p.nut
+ede1e5882d5c5bba48ea33cf1209d231 *./tests/data/lavfi/lavfi_pixdesc-yuvj444p.nut
+15207903 ./tests/data/lavfi/lavfi_pixdesc-yuvj444p.nut
+adcf64516a19fce44df77082bdb16291 *./tests/data/lavfi/lavfi_pixdesc-uyvy422.nut
+10139054 ./tests/data/lavfi/lavfi_pixdesc-uyvy422.nut
+24bd566170343d06fec6fccfff5abc54 *./tests/data/lavfi/lavfi_pixdesc-bgr8.nut
+5070254 ./tests/data/lavfi/lavfi_pixdesc-bgr8.nut
+50d23cc82d9dcef2fd12adb81fb9b806 *./tests/data/lavfi/lavfi_pixdesc-bgr4_byte.nut
+5070254 ./tests/data/lavfi/lavfi_pixdesc-bgr4_byte.nut
+4a9d8e4f2f154e83a7e1735be6300700 *./tests/data/lavfi/lavfi_pixdesc-rgb8.nut
+5070254 ./tests/data/lavfi/lavfi_pixdesc-rgb8.nut
+c93ba89b74c504e7f5ae9d9ab1546c73 *./tests/data/lavfi/lavfi_pixdesc-rgb4_byte.nut
+5070254 ./tests/data/lavfi/lavfi_pixdesc-rgb4_byte.nut
+e0af357888584d36eec5aa0f673793ef *./tests/data/lavfi/lavfi_pixdesc-nv12.nut
+7604654 ./tests/data/lavfi/lavfi_pixdesc-nv12.nut
+9a3297f3b34baa038b1f37cb202b512f *./tests/data/lavfi/lavfi_pixdesc-nv21.nut
+7604654 ./tests/data/lavfi/lavfi_pixdesc-nv21.nut
+c442a8261c2265a07212ef0f72e35f5a *./tests/data/lavfi/lavfi_pixdesc-argb.nut
+20276703 ./tests/data/lavfi/lavfi_pixdesc-argb.nut
+93a5b3712e6eb8c5b9a09ffc7b9fbc12 *./tests/data/lavfi/lavfi_pixdesc-rgba.nut
+20276703 ./tests/data/lavfi/lavfi_pixdesc-rgba.nut
+037bf9df6a765520ad6d490066bf4b89 *./tests/data/lavfi/lavfi_pixdesc-abgr.nut
+20276703 ./tests/data/lavfi/lavfi_pixdesc-abgr.nut
+76a18a5151242fa137133f604cd624d2 *./tests/data/lavfi/lavfi_pixdesc-bgra.nut
+20276703 ./tests/data/lavfi/lavfi_pixdesc-bgra.nut
+7becf34ae825a3df3969bf4c6bfeb5e2 *./tests/data/lavfi/lavfi_pixdesc-gray16be.nut
+10139054 ./tests/data/lavfi/lavfi_pixdesc-gray16be.nut
+10bd87059b5c189f3caef2837f4f2b5c *./tests/data/lavfi/lavfi_pixdesc-gray16le.nut
+10139054 ./tests/data/lavfi/lavfi_pixdesc-gray16le.nut
+5a064afe2b453bb52cdb3f176b1aa1cf *./tests/data/lavfi/lavfi_pixdesc-yuv440p.nut
+10139054 ./tests/data/lavfi/lavfi_pixdesc-yuv440p.nut
+9c3a093ff64a83ac4cf0b1e65390e236 *./tests/data/lavfi/lavfi_pixdesc-yuvj440p.nut
+10139054 ./tests/data/lavfi/lavfi_pixdesc-yuvj440p.nut
+a29884f3f3dfe1e00b961bc17bef3d47 *./tests/data/lavfi/lavfi_pixdesc-yuva420p.nut
+12673454 ./tests/data/lavfi/lavfi_pixdesc-yuva420p.nut
+460b6de89b156290a12d3941db8bd731 *./tests/data/lavfi/lavfi_pixdesc-rgb48be.nut
+30414303 ./tests/data/lavfi/lavfi_pixdesc-rgb48be.nut
+cd93cb34d15996987367dabda3a10128 *./tests/data/lavfi/lavfi_pixdesc-rgb48le.nut
+30414303 ./tests/data/lavfi/lavfi_pixdesc-rgb48le.nut
+d39aa298bb525e9be8860351c6f62dab *./tests/data/lavfi/lavfi_pixdesc-rgb565le.nut
+10139054 ./tests/data/lavfi/lavfi_pixdesc-rgb565le.nut
+a937a0fc764fb57dc1b3af87cba0273c *./tests/data/lavfi/lavfi_pixdesc-rgb555le.nut
+10139054 ./tests/data/lavfi/lavfi_pixdesc-rgb555le.nut
+1dfdd03995c287e3c754b164bf26a355 *./tests/data/lavfi/lavfi_pixdesc-bgr565le.nut
+10139054 ./tests/data/lavfi/lavfi_pixdesc-bgr565le.nut
+378d6ac4223651a1adcbf94a3d0d807b *./tests/data/lavfi/lavfi_pixdesc-bgr555le.nut
+10139054 ./tests/data/lavfi/lavfi_pixdesc-bgr555le.nut
+2d59c4f1d0314a5a957a7cfc4b6fabcc *./tests/data/lavfi/lavfi_pixdesc-yuv420p16le.nut
+15207903 ./tests/data/lavfi/lavfi_pixdesc-yuv420p16le.nut
+16c009a235cd52b74791a895423152a3 *./tests/data/lavfi/lavfi_pixdesc-yuv420p16be.nut
+15207903 ./tests/data/lavfi/lavfi_pixdesc-yuv420p16be.nut
+e3d61fde6978591596bc36b914386623 *./tests/data/lavfi/lavfi_pixdesc-yuv422p16le.nut
+20276703 ./tests/data/lavfi/lavfi_pixdesc-yuv422p16le.nut
+5499502e1c29534a158a1fe60e889f60 *./tests/data/lavfi/lavfi_pixdesc-yuv422p16be.nut
+20276703 ./tests/data/lavfi/lavfi_pixdesc-yuv422p16be.nut
+1262a0dc57ee147967fc896d04206313 *./tests/data/lavfi/lavfi_pixdesc-yuv444p16le.nut
+30414303 ./tests/data/lavfi/lavfi_pixdesc-yuv444p16le.nut
+ea602a24b8e6969679265078bd8607b6 *./tests/data/lavfi/lavfi_pixdesc-yuv444p16be.nut
+30414303 ./tests/data/lavfi/lavfi_pixdesc-yuv444p16be.nut
-- 
1.7.1


--SLDf9lqlvOQaIe6s--



More information about the ffmpeg-devel mailing list