generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavfi/testsrc: set default value for option "color" to NULL and rework color setting logic

Browse Source 
Fix bogus warnings of the kind:
option 'color' is ignored with source 'testsrc'

when the color value is not explicitely set and the filter is different
from "color".
This commit is contained in:
Stefano Sabatini
2012-08-08 16:42:36 +02:00
parent bed63a5e98
commit dbf25b70ea
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libavfilter/vsrc_testsrc.c
View File

@@ -82,8 +82,8 @@ static const AVOption options[] = {
{ "sar", "set video sample aspect ratio", OFFSET(sar), AV_OPT_TYPE_RATIONAL, {.dbl= 1}, 0, INT_MAX },
/* only used by color */
{ "color", "set color", OFFSET(color_str), AV_OPT_TYPE_STRING, {.str = "black"}, CHAR_MIN, CHAR_MAX },
{ "c", "set color", OFFSET(color_str), AV_OPT_TYPE_STRING, {.str = "black"}, CHAR_MIN, CHAR_MAX },
{ "color", "set color", OFFSET(color_str), AV_OPT_TYPE_STRING, {.str = NULL}, CHAR_MIN, CHAR_MAX },
{ "c", "set color", OFFSET(color_str), AV_OPT_TYPE_STRING, {.str = NULL}, CHAR_MIN, CHAR_MAX },
/* only used by testsrc */
{ "decimals", "set number of decimals to show", OFFSET(nb_decimals), AV_OPT_TYPE_INT, {.dbl=0}, INT_MIN, INT_MAX },
@@ -121,13 +121,17 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
ctx->filter->name);
}
if (test->color_str && strcmp(ctx->filter->name, "color")) {
av_log(ctx, AV_LOG_WARNING,
"Option 'color' is ignored with source '%s'\n",
ctx->filter->name);
if (test->color_str) {
if (!strcmp(ctx->filter->name, "color")) {
ret = av_parse_color(test->color_rgba, test->color_str, -1, ctx);
if (ret < 0)
return ret;
} else {
av_log(ctx, AV_LOG_WARNING,
"Option 'color' is ignored with source '%s'\n",
ctx->filter->name);
}
}
if ((ret = av_parse_color(test->color_rgba, test->color_str, -1, ctx)) < 0)
return ret;
test->time_base.num = frame_rate_q.den;
test->time_base.den = frame_rate_q.num;
@@ -226,6 +230,7 @@ static av_cold int color_init(AVFilterContext *ctx, const char *args)
test->class = &color_class;
test->fill_picture_fn = color_fill_picture;
test->draw_once = 1;
av_opt_set(test, "color", "black", 0);
return init(ctx, args);
}