[FFmpeg-devel] [PATCH] lavfi: put color source in a dedicated file
Stefano Sabatini
stefano.sabatini-lala
Sun Feb 20 23:42:24 CET 2011
Move the color source code from vf_pad.c to vsrc_color.c.
---
libavfilter/Makefile | 2 +-
libavfilter/vf_pad.c | 128 -----------------------------------
libavfilter/vsrc_color.c | 167 ++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 168 insertions(+), 129 deletions(-)
create mode 100644 libavfilter/vsrc_color.c
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 30c75bd..bbd8202 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -50,7 +50,7 @@ OBJS-$(CONFIG_VFLIP_FILTER) += vf_vflip.o
OBJS-$(CONFIG_YADIF_FILTER) += vf_yadif.o
OBJS-$(CONFIG_BUFFER_FILTER) += vsrc_buffer.o
-OBJS-$(CONFIG_COLOR_FILTER) += vf_pad.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_NULLSRC_FILTER) += vsrc_nullsrc.o
diff --git a/libavfilter/vf_pad.c b/libavfilter/vf_pad.c
index 30ec5ba..492b08e 100644
--- a/libavfilter/vf_pad.c
+++ b/libavfilter/vf_pad.c
@@ -53,8 +53,6 @@ static int query_formats(AVFilterContext *ctx)
return 0;
}
-#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
@@ -330,129 +328,3 @@ 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 *color = 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, "%127[^:]:%127[^:]:%127s", color_string, frame_size, frame_rate);
-
- if (av_parse_video_size(&color->w, &color->h, frame_size) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Invalid frame size: %s\n", frame_size);
- return AVERROR(EINVAL);
- }
-
- if (av_parse_video_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);
- }
- color->time_base.num = frame_rate_q.den;
- color->time_base.den = frame_rate_q.num;
-
- if ((ret = av_parse_color(color->color, color_string, -1, 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 *color = ctx->priv;
- uint8_t rgba_color[4];
- int is_packed_rgba;
- const AVPixFmtDescriptor *pix_desc = &av_pix_fmt_descriptors[inlink->format];
-
- color->hsub = pix_desc->log2_chroma_w;
- color->vsub = pix_desc->log2_chroma_h;
-
- color->w &= ~((1 << color->hsub) - 1);
- color->h &= ~((1 << color->vsub) - 1);
- if (av_image_check_size(color->w, color->h, 0, ctx) < 0)
- return AVERROR(EINVAL);
-
- memcpy(rgba_color, color->color, sizeof(rgba_color));
- ff_fill_line_with_color(color->line, color->line_step, color->w, color->color,
- inlink->format, rgba_color, &is_packed_rgba, NULL);
-
- av_log(ctx, AV_LOG_INFO, "w:%d h:%d r:%d/%d color:0x%02x%02x%02x%02x[%s]\n",
- color->w, color->h, color->time_base.den, color->time_base.num,
- color->color[0], color->color[1], color->color[2], color->color[3],
- is_packed_rgba ? "rgba" : "yuva");
- inlink->w = color->w;
- inlink->h = color->h;
-
- return 0;
-}
-
-static int color_request_frame(AVFilterLink *link)
-{
- ColorContext *color = link->src->priv;
- AVFilterBufferRef *picref = avfilter_get_video_buffer(link, AV_PERM_WRITE, color->w, color->h);
- picref->video->pixel_aspect = (AVRational) {1, 1};
- picref->pts = av_rescale_q(color->pts++, color->time_base, AV_TIME_BASE_Q);
- picref->pos = 0;
-
- avfilter_start_frame(link, avfilter_ref_buffer(picref, ~0));
- ff_draw_rectangle(picref->data, picref->linesize,
- color->line, color->line_step, color->hsub, color->vsub,
- 0, 0, color->w, color->h);
- avfilter_draw_slice(link, 0, color->h, 1);
- avfilter_end_frame(link);
- avfilter_unref_buffer(picref);
-
- return 0;
-}
-
-AVFilter avfilter_vsrc_color = {
- .name = "color",
- .description = NULL_IF_CONFIG_SMALL("Provide an uniformly colored input, syntax is: [color[:size[:rate]]]"),
-
- .priv_size = sizeof(ColorContext),
- .init = color_init,
- .uninit = color_uninit,
-
- .query_formats = query_formats,
-
- .inputs = (AVFilterPad[]) {{ .name = NULL}},
-
- .outputs = (AVFilterPad[]) {{ .name = "default",
- .type = AVMEDIA_TYPE_VIDEO,
- .request_frame = color_request_frame,
- .config_props = color_config_props },
- { .name = NULL}},
-};
-
-#endif /* CONFIG_COLOR_FILTER */
diff --git a/libavfilter/vsrc_color.c b/libavfilter/vsrc_color.c
new file mode 100644
index 0000000..3fab260
--- /dev/null
+++ b/libavfilter/vsrc_color.c
@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) 2010 Stefano Sabatini
+ *
+ * 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 "avfilter.h"
+#include "libavutil/pixdesc.h"
+#include "libavutil/colorspace.h"
+#include "libavutil/imgutils.h"
+#include "libavutil/parseutils.h"
+#include "drawutils.h"
+
+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 *color = 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, "%127[^:]:%127[^:]:%127s", color_string, frame_size, frame_rate);
+
+ if (av_parse_video_size(&color->w, &color->h, frame_size) < 0) {
+ av_log(ctx, AV_LOG_ERROR, "Invalid frame size: %s\n", frame_size);
+ return AVERROR(EINVAL);
+ }
+
+ if (av_parse_video_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);
+ }
+ color->time_base.num = frame_rate_q.den;
+ color->time_base.den = frame_rate_q.num;
+
+ if ((ret = av_parse_color(color->color, color_string, -1, 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 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;
+}
+
+static int color_config_props(AVFilterLink *inlink)
+{
+ AVFilterContext *ctx = inlink->src;
+ ColorContext *color = ctx->priv;
+ uint8_t rgba_color[4];
+ int is_packed_rgba;
+ const AVPixFmtDescriptor *pix_desc = &av_pix_fmt_descriptors[inlink->format];
+
+ color->hsub = pix_desc->log2_chroma_w;
+ color->vsub = pix_desc->log2_chroma_h;
+
+ color->w &= ~((1 << color->hsub) - 1);
+ color->h &= ~((1 << color->vsub) - 1);
+ if (av_image_check_size(color->w, color->h, 0, ctx) < 0)
+ return AVERROR(EINVAL);
+
+ memcpy(rgba_color, color->color, sizeof(rgba_color));
+ ff_fill_line_with_color(color->line, color->line_step, color->w, color->color,
+ inlink->format, rgba_color, &is_packed_rgba, NULL);
+
+ av_log(ctx, AV_LOG_INFO, "w:%d h:%d r:%d/%d color:0x%02x%02x%02x%02x[%s]\n",
+ color->w, color->h, color->time_base.den, color->time_base.num,
+ color->color[0], color->color[1], color->color[2], color->color[3],
+ is_packed_rgba ? "rgba" : "yuva");
+ inlink->w = color->w;
+ inlink->h = color->h;
+
+ return 0;
+}
+
+static int color_request_frame(AVFilterLink *link)
+{
+ ColorContext *color = link->src->priv;
+ AVFilterBufferRef *picref = avfilter_get_video_buffer(link, AV_PERM_WRITE, color->w, color->h);
+ picref->video->pixel_aspect = (AVRational) {1, 1};
+ picref->pts = av_rescale_q(color->pts++, color->time_base, AV_TIME_BASE_Q);
+ picref->pos = 0;
+
+ avfilter_start_frame(link, avfilter_ref_buffer(picref, ~0));
+ ff_draw_rectangle(picref->data, picref->linesize,
+ color->line, color->line_step, color->hsub, color->vsub,
+ 0, 0, color->w, color->h);
+ avfilter_draw_slice(link, 0, color->h, 1);
+ avfilter_end_frame(link);
+ avfilter_unref_buffer(picref);
+
+ return 0;
+}
+
+AVFilter avfilter_vsrc_color = {
+ .name = "color",
+ .description = NULL_IF_CONFIG_SMALL("Provide an uniformly colored input, syntax is: [color[:size[:rate]]]"),
+
+ .priv_size = sizeof(ColorContext),
+ .init = color_init,
+ .uninit = color_uninit,
+
+ .query_formats = query_formats,
+
+ .inputs = (AVFilterPad[]) {{ .name = NULL}},
+
+ .outputs = (AVFilterPad[]) {{ .name = "default",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .request_frame = color_request_frame,
+ .config_props = color_config_props },
+ { .name = NULL}},
+};
--
1.7.2.3
More information about the ffmpeg-devel
mailing list