[FFmpeg-devel] [PATCH] vsrc_color: port to new drawutils API.

[Stefano Sabatini]

On date Saturday 2012-03-17 19:06:34 +0100, Nicolas George encoded:
> 
> Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
> ---
>  libavfilter/vsrc_color.c |   61 +++++++++-------------------------------------
>  1 files changed, 12 insertions(+), 49 deletions(-)
> 
> 
> Applies on top of the last version of the drawutils new API I posted a few
> days ago.
> 
> 
> diff --git a/libavfilter/vsrc_color.c b/libavfilter/vsrc_color.c
> index 07ff78f..69ba8e0 100644
> --- a/libavfilter/vsrc_color.c
> +++ b/libavfilter/vsrc_color.c
> @@ -33,12 +33,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)
> @@ -66,41 +65,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
> -    };
> -
> -    avfilter_set_common_pixel_formats(ctx, avfilter_make_format_list(pix_fmts));
> +    avfilter_set_common_pixel_formats(ctx, ff_draw_supported_pixel_formats(0));
>      return 0;
>  }
>  
> @@ -108,26 +81,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;
> @@ -144,8 +109,7 @@ static int color_request_frame(AVFilterLink *link)
>      picref->pos = -1;
>  
>      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,
> +    ff_fill_rectangle(&color->draw, &color->color, picref->data, picref->linesize,
>                        0, 0, color->w, color->h);

Patch looks cool, but I noticed that the single memcpy in
ff_draw_rectangle() (which was using the pre-filled buffer) was
replaced by a loop on the width in ff_fill_rectangle(), I wonder if this
impacts on performance (I remember when I first implemented
ff_draw_rectangle() it did).
-- 
FFmpeg = Free & Fierce Multipurpose Pitiless Exxagerate Gorilla