[FFmpeg-devel] av_parse_color() improvement

[Michael Niedermayer]

On Thu, Nov 11, 2010 at 02:29:27AM +0100, Aurelien Jacobs wrote:
> Hi,
> 
> Attached patch makes the av_parse_color() a bit more versatile.
> It allows parsing of html formated hex color (ie. starting with a #
> instead of 0x), including its loose form where the # is missing.
> This makes quite some sens as the function is already able to parse
> html named colors.
> This is required to be able easily use this function to parse colors
> out of SubRip files.
> 
> Aurel
>  parseutils.c |   22 +++++++++++++++++-----
>  parseutils.h |    2 +-
>  2 files changed, 18 insertions(+), 6 deletions(-)
> 4ae48624cebdcb2a693371dd00f51f6cff086711  parse_color.diff
> Index: libavfilter/parseutils.h
> ===================================================================
> --- libavfilter/parseutils.h	(revision 25719)
> +++ libavfilter/parseutils.h	(working copy)
> @@ -31,7 +31,7 @@
>   * Put the RGBA values that correspond to color_string in rgba_color.
>   *
>   * @param color_string a string specifying a color. It can be the name of
> - * a color (case insensitive match) or a 0xRRGGBB[AA] sequence,
> + * a color (case insensitive match) or a [0x|#]RRGGBB[AA] sequence,
>   * possibly followed by "@" and a string representing the alpha
>   * component.
>   * The alpha component may be a string composed by "0x" followed by an
> Index: libavfilter/parseutils.c
> ===================================================================
> --- libavfilter/parseutils.c	(revision 25719)
> +++ libavfilter/parseutils.c	(working copy)
> @@ -187,9 +187,17 @@
>  {
>      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 @@
>          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) {

why is that needed?
i thought things failing this would fail some other tests too


[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

I know you won't believe me, but the highest form of Human Excellence is
to question oneself and others. -- Socrates
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20101112/da59f1f9/attachment.pgp>