Browse Source

lavu/parseutils: add av_get_known_color_name()

tags/n2.1
Stefano Sabatini 11 years ago
parent
commit
d61617a523
4 changed files with 32 additions and 3 deletions
  1. +3
    -1
      doc/APIchanges
  2. +14
    -0
      libavutil/parseutils.c
  3. +13
    -0
      libavutil/parseutils.h
  4. +2
    -2
      libavutil/version.h

+ 3
- 1
doc/APIchanges View File

@@ -15,7 +15,9 @@ libavutil: 2012-10-22

API changes, most recent first:

libavutil 52.47.100
2013-10-27 - xxxxxxx - lavu 52.48.100 - parseutils.h
Add av_get_known_color_name().

2013-10-17 - xxxxxxx - lavu 52.47.100 - opt.h
Add AV_OPT_TYPE_CHANNEL_LAYOUT and channel layout option handlers
av_opt_get_channel_layout() and av_opt_set_channel_layout().


+ 14
- 0
libavutil/parseutils.c View File

@@ -420,6 +420,20 @@ int av_parse_color(uint8_t *rgba_color, const char *color_string, int slen,
return 0;
}

const char *av_get_known_color_name(int color_idx, const uint8_t **rgbp)
{
const ColorEntry *color;

if ((unsigned)color_idx >= FF_ARRAY_ELEMS(color_table))
return NULL;

color = &color_table[color_idx];
if (rgbp)
*rgbp = color->rgb_color;

return color->name;
}

/* get a positive number between n_min and n_max, for a maximum length
of len_max. Return -1 if error. */
static int date_get_num(const char **pp,


+ 13
- 0
libavutil/parseutils.h View File

@@ -98,6 +98,19 @@ int av_parse_video_rate(AVRational *rate, const char *str);
int av_parse_color(uint8_t *rgba_color, const char *color_string, int slen,
void *log_ctx);

/**
* Get the name of a color from the internal table of hard-coded named
* colors.
*
* This function is meant to enumerate the color names recognized by
* av_parse_color().
*
* @param color_idx index of the requested color, starting from 0
* @param rgbp if not NULL, will point to a 3-elements array with the color value in RGB
* @return the color name string or NULL if color_idx is not in the array
*/
const char *av_get_known_color_name(int color_idx, const uint8_t **rgb);

/**
* Parse timestr and return in *time a corresponding number of
* microseconds.


+ 2
- 2
libavutil/version.h View File

@@ -75,8 +75,8 @@
*/

#define LIBAVUTIL_VERSION_MAJOR 52
#define LIBAVUTIL_VERSION_MINOR 47
#define LIBAVUTIL_VERSION_MICRO 101
#define LIBAVUTIL_VERSION_MINOR 48
#define LIBAVUTIL_VERSION_MICRO 100

#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
LIBAVUTIL_VERSION_MINOR, \


Loading…
Cancel
Save