diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2010-11-13 13:49:58 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2010-11-13 13:49:58 +0000 |
| commit | 521b8607488966a236cee5268a8797f3ed37e1ed (patch) | |
| tree | 5f8371086260641751d6b15a3471f15d354e86c4 /libavfilter/parseutils.c | |
| parent | 8f55616fac485ae991019d0d1db13b6ff950fd1a (diff) | |
| download | ffmpeg-521b8607488966a236cee5268a8797f3ed37e1ed.tar.gz | |
improve av_parse_color() to support html formatting
Originally committed as revision 25743 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavfilter/parseutils.c')
| -rw-r--r-- | libavfilter/parseutils.c | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/libavfilter/parseutils.c b/libavfilter/parseutils.c index c78b64a5ef..ebb00614ee 100644 --- a/libavfilter/parseutils.c +++ b/libavfilter/parseutils.c @@ -187,9 +187,17 @@ int av_parse_color(uint8_t *rgba_color, const char *color_string, void *log_ctx) { char *tail, color_string2[128]; const ColorEntry *entry; - av_strlcpy(color_string2, color_string, sizeof(color_string2)); + int len, hex_offset = 0; + + if (color_string[0] == '#') { + hex_offset = 1; + } else if (!strncmp(color_string, "0x", 2)) + hex_offset = 2; + + av_strlcpy(color_string2, color_string + hex_offset, sizeof(color_string2)); if ((tail = strchr(color_string2, ALPHA_SEP))) *tail++ = 0; + len = strlen(color_string2); rgba_color[3] = 255; if (!strcasecmp(color_string2, "random") || !strcasecmp(color_string2, "bikeshed")) { @@ -198,16 +206,16 @@ int av_parse_color(uint8_t *rgba_color, const char *color_string, void *log_ctx) rgba_color[1] = rgba >> 16; rgba_color[2] = rgba >> 8; rgba_color[3] = rgba; - } else if (!strncmp(color_string2, "0x", 2)) { + } else if (hex_offset || + strspn(color_string2, "0123456789ABCDEFabcdef") == len) { char *tail; - int len = strlen(color_string2); unsigned int rgba = strtoul(color_string2, &tail, 16); - if (*tail || (len != 8 && len != 10)) { + if (*tail || (len != 6 && len != 8)) { av_log(log_ctx, AV_LOG_ERROR, "Invalid 0xRRGGBB[AA] color string: '%s'\n", color_string2); return AVERROR(EINVAL); } - if (len == 10) { + if (len == 8) { rgba_color[3] = rgba; rgba >>= 8; } @@ -276,6 +284,10 @@ int main(void) "0xffXXee", "0xfoobar", "0xffffeeeeeeee", + "#ff0000", + "#ffXX00", + "ff0000", + "ffXX00", "red@foo", "random@10", "0xff0000@1.0", |