History

lavfi/drawutils: reimplement ff_fill_rgba_map without hardcoding the list

Same outputs, but computed instead of statically known, so new formats will be supported more easily. Asserts in place to ensure we update this if we add anything incompatible with its logic.

rcombs committed 4 years ago

Commit e24b71a1 parent 50181031 file · +39 −42Browse files

Unified · Split

libavfilter/drawutils.c+39−42
@@ -21,6 +21,7 @@ · 20 unmodified lines
2121
2222 #include <string.h>
2323
24+#include "libavutil/avassert.h"
2425 #include "libavutil/avutil.h"
2526 #include "libavutil/colorspace.h"
2627 #include "libavutil/intreadwrite.h"
@@ -32,50 +33,46 @@ enum { RED = 0, GREEN, BLUE, ALPHA }; · 5 unmodified lines
3233
3334 int ff_fill_rgba_map(uint8_t *rgba_map, enum AVPixelFormat pix_fmt)
3435 {
35− switch (pix_fmt) {
36− case AV_PIX_FMT_0RGB:
37− case AV_PIX_FMT_ARGB: rgba_map[ALPHA] = 0; rgba_map[RED ] = 1; rgba_map[GREEN] = 2; rgba_map[BLUE ] = 3; break;
38− case AV_PIX_FMT_0BGR:
39− case AV_PIX_FMT_ABGR: rgba_map[ALPHA] = 0; rgba_map[BLUE ] = 1; rgba_map[GREEN] = 2; rgba_map[RED ] = 3; break;
40− case AV_PIX_FMT_RGB48LE:
41− case AV_PIX_FMT_RGB48BE:
42− case AV_PIX_FMT_RGBA64BE:
43− case AV_PIX_FMT_RGBA64LE:
44− case AV_PIX_FMT_RGB0:
45− case AV_PIX_FMT_RGBA:
46− case AV_PIX_FMT_RGB24: rgba_map[RED ] = 0; rgba_map[GREEN] = 1; rgba_map[BLUE ] = 2; rgba_map[ALPHA] = 3; break;
47− case AV_PIX_FMT_BGR48LE:
48− case AV_PIX_FMT_BGR48BE:
49− case AV_PIX_FMT_BGRA64BE:
50− case AV_PIX_FMT_BGRA64LE:
51− case AV_PIX_FMT_BGRA:
52− case AV_PIX_FMT_BGR0:
53− case AV_PIX_FMT_BGR24: rgba_map[BLUE ] = 0; rgba_map[GREEN] = 1; rgba_map[RED ] = 2; rgba_map[ALPHA] = 3; break;
54− case AV_PIX_FMT_GBRP9LE:
55− case AV_PIX_FMT_GBRP9BE:
56− case AV_PIX_FMT_GBRP10LE:
57− case AV_PIX_FMT_GBRP10BE:
58− case AV_PIX_FMT_GBRP12LE:
59− case AV_PIX_FMT_GBRP12BE:
60− case AV_PIX_FMT_GBRP14LE:
61− case AV_PIX_FMT_GBRP14BE:
62− case AV_PIX_FMT_GBRP16LE:
63− case AV_PIX_FMT_GBRP16BE:
64− case AV_PIX_FMT_GBRAP:
65− case AV_PIX_FMT_GBRAP10LE:
66− case AV_PIX_FMT_GBRAP10BE:
67− case AV_PIX_FMT_GBRAP12LE:
68− case AV_PIX_FMT_GBRAP12BE:
69− case AV_PIX_FMT_GBRAP16LE:
70− case AV_PIX_FMT_GBRAP16BE:
71− case AV_PIX_FMT_GBRPF32LE:
72− case AV_PIX_FMT_GBRPF32BE:
73− case AV_PIX_FMT_GBRAPF32LE:
74− case AV_PIX_FMT_GBRAPF32BE:
75− case AV_PIX_FMT_GBRP: rgba_map[GREEN] = 0; rgba_map[BLUE ] = 1; rgba_map[RED ] = 2; rgba_map[ALPHA] = 3; break;
76− default: /* unsupported */
36+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
37+ if (!(desc->flags & AV_PIX_FMT_FLAG_RGB))
7738 return AVERROR(EINVAL);
39+ if (desc->flags & AV_PIX_FMT_FLAG_BITSTREAM)
40+ return AVERROR(EINVAL);
41+ av_assert0(desc->nb_components == 3 + !!(desc->flags & AV_PIX_FMT_FLAG_ALPHA));
42+ if (desc->flags & AV_PIX_FMT_FLAG_PLANAR) {
43+ rgba_map[RED] = desc->comp[0].plane;
44+ rgba_map[GREEN] = desc->comp[1].plane;
45+ rgba_map[BLUE] = desc->comp[2].plane;
46+ rgba_map[ALPHA] = (desc->flags & AV_PIX_FMT_FLAG_ALPHA) ? desc->comp[3].plane : 3;
47+ } else {
48+ int had0 = 0;
49+ unsigned depthb = 0;
50+ unsigned i;
51+ for (i = 0; i < desc->nb_components; i++) {
52+ /* all components must have same depth in bytes */
53+ unsigned db = (desc->comp[i].depth + 7) / 8;
54+ unsigned pos = desc->comp[i].offset / db;
55+ if (depthb && (depthb != db))
56+ return AVERROR(ENOSYS);
57+
58+ if (desc->comp[i].offset % db)
59+ return AVERROR(ENOSYS);
60+
61+ had0 |= pos == 0;
62+ rgba_map[i] = pos;
63+ }
64+
65+ if (desc->nb_components == 3)
66+ rgba_map[ALPHA] = had0 ? 3 : 0;
7867 }
68+
69+ av_assert0(rgba_map[RED] != rgba_map[GREEN]);
70+ av_assert0(rgba_map[GREEN] != rgba_map[BLUE]);
71+ av_assert0(rgba_map[BLUE] != rgba_map[RED]);
72+ av_assert0(rgba_map[RED] != rgba_map[ALPHA]);
73+ av_assert0(rgba_map[GREEN] != rgba_map[ALPHA]);
74+ av_assert0(rgba_map[BLUE] != rgba_map[ALPHA]);
75+
7976 return 0;
8077 }
8178

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t