Commit ce2e4ae3 authored by Stefano Sabatini's avatar Stefano Sabatini
Browse files

Add pixdesctest filter and corresponding test.

Originally committed as revision 24092 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 4d508e4d
......@@ -268,6 +268,7 @@ LAVFI_TESTS = \
vflip \
vflip_crop \
vflip_vflip \
lavfi_pixdesc \
# lavfi_pix_fmts \
ACODEC_TESTS := $(addprefix regtest-, $(ACODEC_TESTS) $(ACODEC_TESTS-yes))
......
......@@ -112,6 +112,18 @@ The default value of @var{color} is ``black''.
@end table
@section pixdesctest
Pixel format descriptor test filter, mainly useful for internal
testing. The output video should be equal to the input video.
For example:
@example
format=monow, pixdesctest
@end example
can be used to test the monowhite pixel format descriptor definition.
@section scale
Scale the input video to @var{width}:@var{height} and/or convert the image format.
......
......@@ -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
......
......@@ -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);
......
......@@ -25,7 +25,7 @@
#include "libavutil/avutil.h"
#define LIBAVFILTER_VERSION_MAJOR 1
#define LIBAVFILTER_VERSION_MINOR 21
#define LIBAVFILTER_VERSION_MINOR 22
#define LIBAVFILTER_VERSION_MICRO 0
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
......
/*
* 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;
avfilter_copy_picref_props(outpicref, picref);
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]) {
uint8_t *data = outpicref->data[i] +
(outpicref->linesize[i] > 0 ? 0 : outpicref->linesize[i] * (h-1));
memset(data, 0, FFABS(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}},
};
......@@ -86,6 +86,26 @@ 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)"
ref_file=tests/ref/lavfi/lavfi_pixdesc
rm -f $ref_file
res_file=$logfile
for pix_fmt in $pix_fmts; do
# print to the reference logfile
logfile=$ref_file
do_video_encoding "lavfi_pixdesc-${pix_fmt}.nut" "" \
"-vf slicify=random,format=$pix_fmt -vcodec rawvideo -pix_fmt $pix_fmt"
# print to the result logfile
logfile=$res_file
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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment