[FFmpeg-devel] [misc-filters PATCH 2/5] Add color source.
Stefano Sabatini
stefano.sabatini-lala
Wed Jun 30 01:42:12 CEST 2010
---
libavfilter/Makefile | 1 +
libavfilter/allfilters.c | 1 +
libavfilter/vf_pad.c | 259 ++++++++++++++++++++++++++++++++++++++--------
3 files changed, 218 insertions(+), 43 deletions(-)
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 0874d85..3a238c6 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -28,6 +28,7 @@ OBJS-$(CONFIG_UNSHARP_FILTER) += vf_unsharp.o
OBJS-$(CONFIG_VFLIP_FILTER) += vf_vflip.o
OBJS-$(CONFIG_BUFFER_FILTER) += vsrc_buffer.o
+OBJS-$(CONFIG_COLOR_FILTER) += vf_pad.o
OBJS-$(CONFIG_NULLSRC_FILTER) += vsrc_nullsrc.o
OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o
diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c
index 373dd65..0b4b606 100644
--- a/libavfilter/allfilters.c
+++ b/libavfilter/allfilters.c
@@ -48,6 +48,7 @@ void avfilter_register_all(void)
REGISTER_FILTER (VFLIP, vflip, vf);
REGISTER_FILTER (BUFFER, buffer, vsrc);
+ REGISTER_FILTER (COLOR, color, vsrc);
REGISTER_FILTER (NULLSRC, nullsrc, vsrc);
REGISTER_FILTER (NULLSINK, nullsink, vsink);
diff --git a/libavfilter/vf_pad.c b/libavfilter/vf_pad.c
index 13f1ed4..084ed58 100644
--- a/libavfilter/vf_pad.c
+++ b/libavfilter/vf_pad.c
@@ -21,7 +21,7 @@
/**
* @file
- * video padding filter
+ * video padding filter and color source
*/
#include "avfilter.h"
@@ -29,6 +29,49 @@
#include "libavutil/pixdesc.h"
#include "libavcodec/colorspace.h"
+static void draw_rectangle(AVFilterPicRef *outpic, uint8_t *line[4], int line_step[4],
+ int hsub, int vsub, int x, int y, int w, int h)
+{
+ int i, plane;
+ uint8_t *p;
+
+ for (plane = 0; plane < 4 && outpic->data[plane]; plane++) {
+ int hsub1 = plane == 1 || plane == 2 ? hsub : 0;
+ int vsub1 = plane == 1 || plane == 2 ? vsub : 0;
+
+ p = outpic->data[plane] + (y >> vsub1) * outpic->linesize[plane];
+ for (i = 0; i < (h >> vsub1); i++) {
+ memcpy(p + (x >> hsub1) * line_step[plane], line[plane], (w >> hsub1) * line_step[plane]);
+ p += outpic->linesize[plane];
+ }
+ }
+}
+
+static int query_formats(AVFilterContext *ctx)
+{
+ static const enum PixelFormat pix_fmts[] = {
+ PIX_FMT_ARGB, PIX_FMT_RGBA,
+ PIX_FMT_ABGR, PIX_FMT_BGRA,
+ PIX_FMT_RGB24, PIX_FMT_BGR24,
+
+ PIX_FMT_YUV444P, PIX_FMT_YUV422P,
+ PIX_FMT_YUV420P, PIX_FMT_YUV411P,
+ PIX_FMT_YUV410P, PIX_FMT_YUV440P,
+ PIX_FMT_YUVJ444P, PIX_FMT_YUVJ422P,
+ PIX_FMT_YUVJ420P, PIX_FMT_YUVJ440P,
+ PIX_FMT_YUVA420P,
+
+ PIX_FMT_NONE
+ };
+
+ avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts));
+ return 0;
+}
+
+enum { RED = 0, GREEN, BLUE, ALPHA };
+
+#if CONFIG_PAD_FILTER
+
typedef struct {
int w, h; ///< output dimensions, a value of 0 will result in the input size
int x, y; ///< offsets of the input area with respect to the padded area
@@ -71,29 +114,6 @@ static av_cold void uninit(AVFilterContext *ctx)
}
}
-static int query_formats(AVFilterContext *ctx)
-{
- static const enum PixelFormat pix_fmts[] = {
- PIX_FMT_ARGB, PIX_FMT_RGBA,
- PIX_FMT_ABGR, PIX_FMT_BGRA,
- PIX_FMT_RGB24, PIX_FMT_BGR24,
-
- PIX_FMT_YUV444P, PIX_FMT_YUV422P,
- PIX_FMT_YUV420P, PIX_FMT_YUV411P,
- PIX_FMT_YUV410P, PIX_FMT_YUV440P,
- PIX_FMT_YUVJ444P, PIX_FMT_YUVJ422P,
- PIX_FMT_YUVJ420P, PIX_FMT_YUVJ440P,
- PIX_FMT_YUVA420P,
-
- PIX_FMT_NONE
- };
-
- avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts));
- return 0;
-}
-
-enum { RED = 0, GREEN, BLUE, ALPHA };
-
static int config_input(AVFilterLink *inlink)
{
AVFilterContext *ctx = inlink->dst;
@@ -238,24 +258,6 @@ static void end_frame(AVFilterLink *link)
avfilter_unref_pic(link->cur_pic);
}
-static void draw_rectangle(AVFilterPicRef *outpic, uint8_t *line[4], int line_step[4],
- int hsub, int vsub, int x, int y, int w, int h)
-{
- int i, plane;
- uint8_t *p;
-
- for (plane = 0; plane < 4 && outpic->data[plane]; plane++) {
- int hsub1 = plane == 1 || plane == 2 ? hsub : 0;
- int vsub1 = plane == 1 || plane == 2 ? vsub : 0;
-
- p = outpic->data[plane] + (y >> vsub1) * outpic->linesize[plane];
- for (i = 0; i < (h >> vsub1); i++) {
- memcpy(p + (x >> hsub1) * line_step[plane], line[plane], (w >> hsub1) * line_step[plane]);
- p += outpic->linesize[plane];
- }
- }
-}
-
static void draw_send_bar_slice(AVFilterLink *link, int y, int h, int slice_dir, int before_slice)
{
PadContext *pad = link->dst->priv;
@@ -306,7 +308,7 @@ static void draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
AVFilter avfilter_vf_pad = {
.name = "pad",
- .description = "Add pads to the input image.",
+ .description = NULL_IF_CONFIG_SMALL("Add pads to the input image."),
.priv_size = sizeof(PadContext),
.init = init,
@@ -327,3 +329,174 @@ AVFilter avfilter_vf_pad = {
.config_props = config_output, },
{ .name = NULL}},
};
+
+#endif /* CONFIG_PAD_FILTER */
+
+#if CONFIG_COLOR_FILTER
+
+typedef struct {
+ int w, h;
+ uint8_t color[4];
+ AVRational time_base;
+ uint8_t *line[4];
+ int line_step[4];
+ int hsub, vsub; ///< chroma subsampling values
+ uint64_t pts;
+} ColorContext;
+
+static av_cold int color_init(AVFilterContext *ctx, const char *args, void *opaque)
+{
+ ColorContext *priv = ctx->priv;
+ char color_string[128] = "black";
+ char frame_size [128] = "320x240";
+ char frame_rate [128] = "25";
+ AVRational frame_rate_q;
+ int ret;
+
+ if (args)
+ sscanf(args, "%128[^:]:%128[^:]:%128s", color_string, frame_size, frame_rate);
+
+ if (av_parse_video_frame_size(&priv->w, &priv->h, frame_size) < 0) {
+ av_log(ctx, AV_LOG_ERROR, "Invalid frame size: %s\n", frame_size);
+ return AVERROR(EINVAL);
+ }
+
+ if (av_parse_video_frame_rate(&frame_rate_q, frame_rate) < 0 ||
+ frame_rate_q.den <= 0 || frame_rate_q.num <= 0) {
+ av_log(ctx, AV_LOG_ERROR, "Invalid frame rate: %s\n", frame_rate);
+ return AVERROR(EINVAL);
+ }
+ priv->time_base.num = frame_rate_q.den;
+ priv->time_base.den = frame_rate_q.num;
+
+ if ((ret = av_parse_color(priv->color, color_string, ctx)) < 0)
+ return ret;
+
+ return 0;
+}
+
+static av_cold void color_uninit(AVFilterContext *ctx)
+{
+ ColorContext *color = ctx->priv;
+ int i;
+
+ for (i = 0; i < 4; i++) {
+ av_freep(&color->line[i]);
+ color->line_step[i] = 0;
+ }
+}
+
+static int color_config_props(AVFilterLink *inlink)
+{
+ AVFilterContext *ctx = inlink->src;
+ ColorContext *priv = ctx->priv;
+ uint8_t rgba_color[4];
+ uint8_t rgba_map[4];
+ int i, is_packed_rgb = 1;
+ const AVPixFmtDescriptor *pix_desc = &av_pix_fmt_descriptors[inlink->format];
+
+ switch (inlink->format) {
+ case PIX_FMT_ARGB:
+ rgba_map[ALPHA] = 0; rgba_map[RED] = 1; rgba_map[GREEN] = 2; rgba_map[BLUE] = 3;
+ break;
+ case PIX_FMT_ABGR:
+ rgba_map[ALPHA] = 0; rgba_map[BLUE] = 1; rgba_map[GREEN] = 2; rgba_map[RED] = 3;
+ break;
+ case PIX_FMT_RGBA:
+ case PIX_FMT_RGB24:
+ rgba_map[RED] = 0; rgba_map[GREEN] = 1; rgba_map[BLUE] = 2; rgba_map[ALPHA] = 3;
+ break;
+ case PIX_FMT_BGRA:
+ case PIX_FMT_BGR24:
+ rgba_map[BLUE] = 0; rgba_map[GREEN] = 1; rgba_map[RED] = 2; rgba_map[ALPHA] = 3;
+ break;
+ default:
+ is_packed_rgb = 0;
+ }
+
+ priv->hsub = pix_desc->log2_chroma_w;
+ priv->vsub = pix_desc->log2_chroma_h;
+
+ memcpy(rgba_color, priv->color, sizeof(rgba_color));
+ if (is_packed_rgb) {
+ priv->line_step[0] = (av_get_bits_per_pixel(&av_pix_fmt_descriptors[inlink->format]))>>3;
+ for (i = 0; i < 4; i++)
+ priv->color[rgba_map[i]] = rgba_color[i];
+
+ priv->line[0] = av_malloc(priv->w * priv->line_step[0]);
+ for (i = 0; i < priv->w; i++)
+ memcpy(priv->line[0] + i * priv->line_step[0], priv->color, priv->line_step[0]);
+ } else {
+ int plane;
+
+ priv->color[RED ] = RGB_TO_Y(rgba_color[0], rgba_color[1], rgba_color[2]);
+ priv->color[GREEN] = RGB_TO_U(rgba_color[0], rgba_color[1], rgba_color[2], 0);
+ priv->color[BLUE ] = RGB_TO_V(rgba_color[0], rgba_color[1], rgba_color[2], 0);
+ priv->color[ALPHA] = rgba_color[3];
+
+ for (plane = 0; plane < 4; plane++) {
+ int line_size;
+ int hsub = (plane == 1 || plane == 2) ? priv->hsub : 0;
+
+ priv->line_step[plane] = 1;
+ line_size = (priv->w >> hsub) * priv->line_step[plane];
+ priv->line[plane] = av_malloc(line_size);
+ memset(priv->line[plane], priv->color[plane], line_size);
+ }
+ }
+
+ priv->w &= ~((1 << priv->hsub) - 1);
+ priv->h &= ~((1 << priv->vsub) - 1);
+ if (avcodec_check_dimensions(ctx, priv->w, priv->h) < 0)
+ return AVERROR(EINVAL);
+
+ av_log(ctx, AV_LOG_INFO, "w:%d h:%d r:%d/%d color:0x%02x%02x%02x%02x\n",
+ priv->w, priv->h, priv->time_base.den, priv->time_base.num,
+ priv->color[0], priv->color[1], priv->color[2], priv->color[3]);
+
+ inlink->w = priv->w;
+ inlink->h = priv->h;
+
+ return 0;
+}
+
+static int color_request_frame(AVFilterLink *link)
+{
+ ColorContext *priv = link->src->priv;
+ AVFilterPicRef *picref = avfilter_get_video_buffer(link, AV_PERM_WRITE, priv->w, priv->h);
+ picref->pixel_aspect = (AVRational) {1, 1};
+ picref->pts = av_rescale_q(priv->pts++, priv->time_base, AV_TIME_BASE_Q);
+ picref->pos = 0;
+
+ avfilter_start_frame(link, avfilter_ref_pic(picref, ~0));
+ draw_rectangle(picref,
+ priv->line, priv->line_step, priv->hsub, priv->vsub,
+ 0, 0, priv->w, priv->h);
+ avfilter_draw_slice(link, 0, priv->h, 1);
+ avfilter_end_frame(link);
+ avfilter_unref_pic(picref);
+
+ return 0;
+}
+
+AVFilter avfilter_vsrc_color=
+{
+ .name = "color",
+ .description = NULL_IF_CONFIG_SMALL("Provide an uniformely colored input."),
+
+ .priv_size = sizeof(ColorContext),
+ .init = color_init,
+ .uninit = color_uninit,
+
+ .query_formats = query_formats,
+
+ .inputs = (AVFilterPad[]) {{ .name = NULL}},
+
+ .outputs = (AVFilterPad[]) {{ .name = "default",
+ .type = CODEC_TYPE_VIDEO,
+ .request_frame = color_request_frame,
+ .config_props = color_config_props },
+ { .name = NULL}},
+};
+
+#endif /* CONFIG_COLOR_FILTER */
--
1.7.1
More information about the ffmpeg-devel
mailing list