X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Fvsrc_color.c;h=3b506ec422c8a56ef8ecdd504b56f13de870bc9f;hb=ce2e858f5b3416c2d54f7f8c14e901f75c48b785;hp=de1f340b013ef0c9903ba4099f1c9ebfa3f03f04;hpb=9d0bfc5052fa73ac8df89ec9992d77b07840fdf0;p=ffmpeg diff --git a/libavfilter/vsrc_color.c b/libavfilter/vsrc_color.c index de1f340b013..3b506ec422c 100644 --- a/libavfilter/vsrc_color.c +++ b/libavfilter/vsrc_color.c @@ -23,6 +23,9 @@ * color source */ +#include +#include + #include "avfilter.h" #include "formats.h" #include "internal.h" @@ -30,11 +33,15 @@ #include "libavutil/pixdesc.h" #include "libavutil/colorspace.h" #include "libavutil/imgutils.h" +#include "libavutil/internal.h" #include "libavutil/mathematics.h" +#include "libavutil/mem.h" +#include "libavutil/opt.h" #include "libavutil/parseutils.h" #include "drawutils.h" -typedef struct { +typedef struct ColorContext { + const AVClass *class; int w, h; uint8_t color[4]; AVRational time_base; @@ -42,34 +49,31 @@ typedef struct { int line_step[4]; int hsub, vsub; ///< chroma subsampling values uint64_t pts; + char *color_str; + char *size_str; + char *framerate_str; } ColorContext; -static av_cold int color_init(AVFilterContext *ctx, const char *args, void *opaque) +static av_cold int color_init(AVFilterContext *ctx) { 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); + if (av_parse_video_size(&color->w, &color->h, color->size_str) < 0) { + av_log(ctx, AV_LOG_ERROR, "Invalid frame size: %s\n", color->size_str); return AVERROR(EINVAL); } - if (av_parse_video_rate(&frame_rate_q, frame_rate) < 0 || + if (av_parse_video_rate(&frame_rate_q, color->framerate_str) < 0 || frame_rate_q.den <= 0 || frame_rate_q.num <= 0) { - av_log(ctx, AV_LOG_ERROR, "Invalid frame rate: %s\n", frame_rate); + av_log(ctx, AV_LOG_ERROR, "Invalid frame rate: %s\n", color->framerate_str); 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) + if ((ret = av_parse_color(color->color, color->color_str, -1, ctx)) < 0) return ret; return 0; @@ -88,19 +92,19 @@ static av_cold void color_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 + static const enum AVPixelFormat pix_fmts[] = { + AV_PIX_FMT_ARGB, AV_PIX_FMT_RGBA, + AV_PIX_FMT_ABGR, AV_PIX_FMT_BGRA, + AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, + + AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV422P, + AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV411P, + AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV440P, + AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ422P, + AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ440P, + AV_PIX_FMT_YUVA420P, + + AV_PIX_FMT_NONE }; ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); @@ -113,7 +117,7 @@ static int color_config_props(AVFilterLink *inlink) ColorContext *color = ctx->priv; uint8_t rgba_color[4]; int is_packed_rgba; - const AVPixFmtDescriptor *pix_desc = &av_pix_fmt_descriptors[inlink->format]; + const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(inlink->format); color->hsub = pix_desc->log2_chroma_w; color->vsub = pix_desc->log2_chroma_h; @@ -127,7 +131,7 @@ static int color_config_props(AVFilterLink *inlink) 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", + av_log(ctx, AV_LOG_VERBOSE, "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"); @@ -141,37 +145,58 @@ static int color_config_props(AVFilterLink *inlink) static int color_request_frame(AVFilterLink *link) { ColorContext *color = link->src->priv; - AVFilterBufferRef *picref = ff_get_video_buffer(link, AV_PERM_WRITE, color->w, color->h); - picref->video->pixel_aspect = (AVRational) {1, 1}; - picref->pts = color->pts++; - picref->pos = -1; + AVFrame *frame = ff_get_video_buffer(link, color->w, color->h); + + if (!frame) + return AVERROR(ENOMEM); - ff_start_frame(link, avfilter_ref_buffer(picref, ~0)); - ff_draw_rectangle(picref->data, picref->linesize, + frame->sample_aspect_ratio = (AVRational) {1, 1}; + frame->pts = color->pts++; + + ff_draw_rectangle(frame->data, frame->linesize, color->line, color->line_step, color->hsub, color->vsub, 0, 0, color->w, color->h); - ff_draw_slice(link, 0, color->h, 1); - ff_end_frame(link); - avfilter_unref_buffer(picref); - - return 0; + return ff_filter_frame(link, frame); } -AVFilter avfilter_vsrc_color = { +#define OFFSET(x) offsetof(ColorContext, x) +#define FLAGS AV_OPT_FLAG_VIDEO_PARAM +static const AVOption options[] = { + { "color", "Output video color", OFFSET(color_str), AV_OPT_TYPE_STRING, { .str = "black" }, .flags = FLAGS }, + { "size", "Output video size (wxh or an abbreviation)", OFFSET(size_str), AV_OPT_TYPE_STRING, { .str = "320x240" }, .flags = FLAGS }, + { "framerate", "Output video framerate", OFFSET(framerate_str), AV_OPT_TYPE_STRING, { .str = "25" }, .flags = FLAGS }, + { NULL }, +}; + +static const AVClass color_class = { + .class_name = "color", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, +}; + +static const AVFilterPad avfilter_vsrc_color_outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .request_frame = color_request_frame, + .config_props = color_config_props + }, + { NULL } +}; + +AVFilter ff_vsrc_color = { .name = "color", .description = NULL_IF_CONFIG_SMALL("Provide an uniformly colored input, syntax is: [color[:size[:rate]]]"), + .priv_class = &color_class, .priv_size = sizeof(ColorContext), .init = color_init, .uninit = color_uninit, .query_formats = query_formats, - .inputs = (AVFilterPad[]) {{ .name = NULL}}, + .inputs = NULL, - .outputs = (AVFilterPad[]) {{ .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .request_frame = color_request_frame, - .config_props = color_config_props }, - { .name = NULL}}, + .outputs = avfilter_vsrc_color_outputs, };