MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavfi/life: switch to AV_OPT_TYPE_COLOR

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2013-05-13 14:52:21 +00:00
parent 05b7560d39
commit 83e892233c
1 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libavfilter/vsrc_life.c
View File

@ -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);
if (!life->mold && memcmp(life->mold_color, "\x00\x00\x00", 3))
av_log(ctx, AV_LOG_WARNING,
"Mold color is set while mold isn't, ignoring the color.\n");