diff options
Diffstat (limited to 'libavfilter/vsrc_color.c')
-rw-r--r-- | libavfilter/vsrc_color.c | 81 |
1 files changed, 22 insertions, 59 deletions
diff --git a/libavfilter/vsrc_color.c b/libavfilter/vsrc_color.c index 99ea0ad..cde9714 100644 --- a/libavfilter/vsrc_color.c +++ b/libavfilter/vsrc_color.c @@ -1,20 +1,20 @@ /* * Copyright (c) 2010 Stefano Sabatini * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * 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. * - * Libav is distributed in the hope that it will be useful, + * 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 Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -35,12 +35,11 @@ typedef struct { int w, h; - uint8_t color[4]; + uint8_t color_rgba[4]; AVRational time_base; - uint8_t *line[4]; - int line_step[4]; - int hsub, vsub; ///< chroma subsampling values uint64_t pts; + FFDrawContext draw; + FFDrawColor color; } ColorContext; static av_cold int color_init(AVFilterContext *ctx, const char *args, void *opaque) @@ -68,41 +67,15 @@ static av_cold int color_init(AVFilterContext *ctx, const char *args, void *opaq 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_rgba, 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 - }; - - ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); + ff_set_common_formats(ctx, ff_draw_supported_pixel_formats(0)); return 0; } @@ -110,26 +83,18 @@ 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; + ff_draw_init(&color->draw, inlink->format, 0); + ff_draw_color(&color->draw, &color->color, color->color_rgba); - color->w &= ~((1 << color->hsub) - 1); - color->h &= ~((1 << color->vsub) - 1); + color->w = ff_draw_round_to_sub(&color->draw, 0, -1, color->w); + color->h = ff_draw_round_to_sub(&color->draw, 1, -1, color->h); 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", + av_log(ctx, AV_LOG_INFO, "w:%d h:%d r:%d/%d color:0x%02x%02x%02x%02x\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"); + color->color_rgba[0], color->color_rgba[1], color->color_rgba[2], color->color_rgba[3]); inlink->w = color->w; inlink->h = color->h; inlink->time_base = color->time_base; @@ -141,13 +106,12 @@ 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 = color->pts++; - picref->pos = -1; + picref->video->sample_aspect_ratio = (AVRational) {1, 1}; + picref->pts = color->pts++; + picref->pos = -1; ff_start_frame(link, avfilter_ref_buffer(picref, ~0)); - ff_draw_rectangle(picref->data, picref->linesize, - color->line, color->line_step, color->hsub, color->vsub, + ff_fill_rectangle(&color->draw, &color->color, picref->data, picref->linesize, 0, 0, color->w, color->h); ff_draw_slice(link, 0, color->h, 1); ff_end_frame(link); @@ -158,17 +122,16 @@ static int color_request_frame(AVFilterLink *link) AVFilter avfilter_vsrc_color = { .name = "color", - .description = NULL_IF_CONFIG_SMALL("Provide an uniformly colored input, syntax is: [color[:size[:rate]]]"), + .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}}, + .inputs = (const AVFilterPad[]) {{ .name = NULL}}, - .outputs = (AVFilterPad[]) {{ .name = "default", + .outputs = (const AVFilterPad[]) {{ .name = "default", .type = AVMEDIA_TYPE_VIDEO, .request_frame = color_request_frame, .config_props = color_config_props }, |