[FFmpeg-devel] [PATCH 3/5] lavfi/life: switch to AV_OPT_TYPE_COLOR

[Stefano Sabatini]

On date Monday 2013-05-13 15:11:38 +0000, Paul B Mahol encoded:
> Signed-off-by: Paul B Mahol <onemda at gmail.com>
> ---
>  libavfilter/vsrc_life.c | 22 +++-------------------
>  1 file changed, 3 insertions(+), 19 deletions(-)
> 
> diff --git a/libavfilter/vsrc_life.c b/libavfilter/vsrc_life.c
> index 85f0989..e56f51e 100644
> --- a/libavfilter/vsrc_life.c
> +++ b/libavfilter/vsrc_life.c
> @@ -65,9 +65,6 @@ typedef struct {
>      uint32_t random_seed;
>      int stitch;
>      int mold;
> -    char  *life_color_str;
> -    char *death_color_str;
> -    char  *mold_color_str;
>      uint8_t  life_color[4];
>      uint8_t death_color[4];
>      uint8_t  mold_color[4];
> @@ -93,9 +90,9 @@ static const AVOption life_options[] = {
>      { "seed",        "set the seed for filling the initial grid randomly", OFFSET(random_seed), AV_OPT_TYPE_INT, {.i64=-1}, -1, UINT32_MAX, FLAGS },
>      { "stitch",      "stitch boundaries", OFFSET(stitch), AV_OPT_TYPE_INT, {.i64=1}, 0, 1, FLAGS },
>      { "mold",        "set mold speed for dead cells", OFFSET(mold), AV_OPT_TYPE_INT, {.i64=0}, 0, 0xFF, FLAGS },
> -    { "life_color",  "set life color",  OFFSET( life_color_str), AV_OPT_TYPE_STRING, {.str="white"}, CHAR_MIN, CHAR_MAX, FLAGS },
> -    { "death_color", "set death color", OFFSET(death_color_str), AV_OPT_TYPE_STRING, {.str="black"}, CHAR_MIN, CHAR_MAX, FLAGS },
> -    { "mold_color",  "set mold color",  OFFSET( mold_color_str), AV_OPT_TYPE_STRING, {.str="black"}, CHAR_MIN, CHAR_MAX, FLAGS },
> +    { "life_color",  "set life color",  OFFSET( life_color), AV_OPT_TYPE_COLOR, {.str="white"}, CHAR_MIN, CHAR_MAX, FLAGS },
> +    { "death_color", "set death color", OFFSET(death_color), AV_OPT_TYPE_COLOR, {.str="black"}, CHAR_MIN, CHAR_MAX, FLAGS },
> +    { "mold_color",  "set mold color",  OFFSET( mold_color), AV_OPT_TYPE_COLOR, {.str="black"}, CHAR_MIN, CHAR_MAX, FLAGS },
>      { NULL },
>  };
>  
> @@ -231,19 +228,6 @@ static int init(AVFilterContext *ctx)
>      if ((ret = parse_rule(&life->born_rule, &life->stay_rule, life->rule_str, ctx)) < 0)
>          return ret;
>  
> -#define PARSE_COLOR(name) do { \
> -    if ((ret = av_parse_color(life->name ## _color, life->name ## _color_str, -1, ctx))) { \
> -        av_log(ctx, AV_LOG_ERROR, "Invalid " #name " color '%s'\n", \
> -               life->name ## _color_str); \
> -        return ret; \
> -    } \
> -    av_freep(&life->name ## _color_str); \
> -} while (0)
> -
> -    PARSE_COLOR(life);
> -    PARSE_COLOR(death);
> -    PARSE_COLOR(mold);
> -

LGTM, thanks.
-- 
FFmpeg = ***king and ***king Merciful Powerful Epic Gospel