History

lavfi/drawutils: overhaul to improve pixel format support

- No longer mixes u8 and u16 component accesses (this was UB) - De-duplicated 8->16 conversion - De-duplicated component -> plane+offset conversion - De-duplicated planar + packed RGB - No longer calls ff_fill_rgba_map - Removed redundant comp_mask data member - RGB0 and related formats no longer write an alpha value to the 0 byte - Non-planar YA formats now work correctly - High-bit-depth semi-planar YUV now works correctly

rcombs committed 4 years ago

Commit 66343e41 parent f67bd3a3 files · +58 −73Browse files

Unified · Split

3 files
  1. libavfilter/drawutils.c +48 −62
  2. libavfilter/drawutils.h +0 −1
  3. tests/ref/fate/filter-pixfmts-pad +10 −10
libavfilter/drawutils.c+48−62
@@ -137,66 +137,49 @@ int ff_draw_init(FFDrawContext *draw, enum AVPixelFormat format, unsigned flags) · 136 unmodified lines
137137 memcpy(draw->pixelstep, pixelstep, sizeof(draw->pixelstep));
138138 draw->hsub[1] = draw->hsub[2] = draw->hsub_max = desc->log2_chroma_w;
139139 draw->vsub[1] = draw->vsub[2] = draw->vsub_max = desc->log2_chroma_h;
140− for (i = 0; i < (desc->nb_components - !!(desc->flags & AV_PIX_FMT_FLAG_ALPHA && !(flags & FF_DRAW_PROCESS_ALPHA))); i++)
141− draw->comp_mask[desc->comp[i].plane] |=
142− 1 << desc->comp[i].offset;
143140 return 0;
144141 }
145142
146143 void ff_draw_color(FFDrawContext *draw, FFDrawColor *color, const uint8_t rgba[4])
147144 {
148145 unsigned i;
149− uint8_t rgba_map[4];
146+ uint8_t tmp8[4];
147+ const AVPixFmtDescriptor *desc = draw->desc;
150148
151149 if (rgba != color->rgba)
152150 memcpy(color->rgba, rgba, sizeof(color->rgba));
153− if ((draw->desc->flags & AV_PIX_FMT_FLAG_RGB) &&
154− ff_fill_rgba_map(rgba_map, draw->format) >= 0) {
155− if (draw->nb_planes == 1) {
156− for (i = 0; i < 4; i++) {
157− color->comp[0].u8[rgba_map[i]] = rgba[i];
158− if (draw->desc->comp[rgba_map[i]].depth > 8) {
159− color->comp[0].u16[rgba_map[i]] = color->comp[0].u8[rgba_map[i]] << 8;
160− }
161− }
162− } else {
163− for (i = 0; i < 4; i++) {
164− color->comp[rgba_map[i]].u8[0] = rgba[i];
165− if (draw->desc->comp[rgba_map[i]].depth > 8)
166− color->comp[rgba_map[i]].u16[0] = color->comp[rgba_map[i]].u8[0] << (draw->desc->comp[rgba_map[i]].depth - 8);
167− }
168− }
151+
152+ memset(color->comp, 0, sizeof(color->comp));
153+
154+ if (draw->desc->flags & AV_PIX_FMT_FLAG_RGB) {
155+ memcpy(tmp8, rgba, sizeof(tmp8));
169156 } else if (draw->nb_planes >= 2) {
170157 /* assume YUV */
171− const AVPixFmtDescriptor *desc = draw->desc;
172− color->comp[desc->comp[0].plane].u8[desc->comp[0].offset] = draw->full_range ? RGB_TO_Y_JPEG(rgba[0], rgba[1], rgba[2]) : RGB_TO_Y_CCIR(rgba[0], rgba[1], rgba[2]);
173− color->comp[desc->comp[1].plane].u8[desc->comp[1].offset] = draw->full_range ? RGB_TO_U_JPEG(rgba[0], rgba[1], rgba[2]) : RGB_TO_U_CCIR(rgba[0], rgba[1], rgba[2], 0);
174− color->comp[desc->comp[2].plane].u8[desc->comp[2].offset] = draw->full_range ? RGB_TO_V_JPEG(rgba[0], rgba[1], rgba[2]) : RGB_TO_V_CCIR(rgba[0], rgba[1], rgba[2], 0);
175− color->comp[3].u8[0] = rgba[3];
176−#define EXPAND(compn) \
177− if (desc->comp[compn].depth > 8) \
178− color->comp[desc->comp[compn].plane].u16[desc->comp[compn].offset] = \
179− color->comp[desc->comp[compn].plane].u8[desc->comp[compn].offset] << \
180− (draw->desc->comp[compn].depth + draw->desc->comp[compn].shift - 8)
181− EXPAND(3);
182− EXPAND(2);
183− EXPAND(1);
184− EXPAND(0);
158+ tmp8[0] = draw->full_range ? RGB_TO_Y_JPEG(rgba[0], rgba[1], rgba[2]) : RGB_TO_Y_CCIR(rgba[0], rgba[1], rgba[2]);
159+ tmp8[1] = draw->full_range ? RGB_TO_U_JPEG(rgba[0], rgba[1], rgba[2]) : RGB_TO_U_CCIR(rgba[0], rgba[1], rgba[2], 0);
160+ tmp8[2] = draw->full_range ? RGB_TO_V_JPEG(rgba[0], rgba[1], rgba[2]) : RGB_TO_V_CCIR(rgba[0], rgba[1], rgba[2], 0);
161+ tmp8[3] = rgba[3];
185162 } else if (draw->format == AV_PIX_FMT_GRAY8 || draw->format == AV_PIX_FMT_GRAY8A ||
186163 draw->format == AV_PIX_FMT_GRAY16LE || draw->format == AV_PIX_FMT_YA16LE ||
187164 draw->format == AV_PIX_FMT_GRAY9LE ||
188165 draw->format == AV_PIX_FMT_GRAY10LE ||
189166 draw->format == AV_PIX_FMT_GRAY12LE ||
190167 draw->format == AV_PIX_FMT_GRAY14LE) {
191− const AVPixFmtDescriptor *desc = draw->desc;
192− color->comp[0].u8[0] = RGB_TO_Y_CCIR(rgba[0], rgba[1], rgba[2]);
193− EXPAND(0);
194− color->comp[1].u8[0] = rgba[3];
195− EXPAND(1);
168+ tmp8[0] = RGB_TO_Y_CCIR(rgba[0], rgba[1], rgba[2]);
169+ tmp8[1] = rgba[3];
196170 } else {
197171 av_log(NULL, AV_LOG_WARNING,
198172 "Color conversion not implemented for %s\n", draw->desc->name);
199173 memset(color, 128, sizeof(*color));
174+ return;
175+ }
176+
177+ for (i = 0; i < desc->nb_components; i++) {
178+ if (desc->comp[i].depth > 8)
179+ color->comp[desc->comp[i].plane].u16[desc->comp[i].offset / 2] = tmp8[i] <<
180+ (draw->desc->comp[i].depth + draw->desc->comp[i].shift - 8);
181+ else
182+ color->comp[desc->comp[i].plane].u8[desc->comp[i].offset] = tmp8[i];
200183 }
201184 }
202185
@@ -302,11 +285,6 @@ static void subsampling_bounds(int sub, int *x, int *w, int *start, int *end) · 99 unmodified lines
302285 *w >>= sub;
303286 }
304287
305−static int component_used(FFDrawContext *draw, int plane, int comp)
306−{
307− return (draw->comp_mask[plane] >> comp) & 1;
308−}
309−
310288 /* If alpha is in the [ 0 ; 0x1010101 ] range,
311289 then alpha * value is in the [ 0 ; 0xFFFFFFFF ] range,
312290 and >> 24 gives a correct rounding. */
@@ -366,6 +344,9 @@ void ff_blend_rectangle(FFDrawContext *draw, FFDrawColor *color, · 53 unmodified lines
366344 int w_sub, h_sub, x_sub, y_sub, left, right, top, bottom, y;
367345 uint8_t *p0, *p;
368346
347+ nb_comp = draw->desc->nb_components -
348+ !!(draw->desc->flags & AV_PIX_FMT_FLAG_ALPHA && !(draw->flags & FF_DRAW_PROCESS_ALPHA));
349+
369350 /* TODO optimize if alpha = 0xFF */
370351 clip_interval(dst_w, &x0, &w, NULL);
371352 clip_interval(dst_h, &y0, &h, NULL);
@@ -381,7 +362,6 @@ void ff_blend_rectangle(FFDrawContext *draw, FFDrawColor *color, · 9 unmodified lines
381362 nb_planes = draw->nb_planes - !!(draw->desc->flags & AV_PIX_FMT_FLAG_ALPHA && !(draw->flags & FF_DRAW_PROCESS_ALPHA));
382363 nb_planes += !nb_planes;
383364 for (plane = 0; plane < nb_planes; plane++) {
384− nb_comp = draw->pixelstep[plane];
385365 p0 = pointer_at(draw, dst, dst_linesize, plane, x0, y0);
386366 w_sub = w;
387367 h_sub = h;
@@ -391,17 +371,19 @@ void ff_blend_rectangle(FFDrawContext *draw, FFDrawColor *color, · 3 unmodified lines
391371 subsampling_bounds(draw->vsub[plane], &y_sub, &h_sub, &top, &bottom);
392372 for (comp = 0; comp < nb_comp; comp++) {
393373 const int depth = draw->desc->comp[comp].depth;
374+ const int offset = draw->desc->comp[comp].offset;
375+ const int index = offset / ((depth + 7) / 8);
394376
395− if (!component_used(draw, plane, comp))
377+ if (draw->desc->comp[comp].plane != plane)
396378 continue;
397− p = p0 + comp;
379+ p = p0 + offset;
398380 if (top) {
399381 if (depth <= 8) {
400− blend_line(p, color->comp[plane].u8[comp], alpha >> 1,
382+ blend_line(p, color->comp[plane].u8[index], alpha >> 1,
401383 draw->pixelstep[plane], w_sub,
402384 draw->hsub[plane], left, right);
403385 } else {
404− blend_line16(p, color->comp[plane].u16[comp], alpha >> 1,
386+ blend_line16(p, color->comp[plane].u16[index], alpha >> 1,
405387 draw->pixelstep[plane], w_sub,
406388 draw->hsub[plane], left, right);
407389 }
@@ -409,14 +391,14 @@ void ff_blend_rectangle(FFDrawContext *draw, FFDrawColor *color, · 1 unmodified line
409391 }
410392 if (depth <= 8) {
411393 for (y = 0; y < h_sub; y++) {
412− blend_line(p, color->comp[plane].u8[comp], alpha,
394+ blend_line(p, color->comp[plane].u8[index], alpha,
413395 draw->pixelstep[plane], w_sub,
414396 draw->hsub[plane], left, right);
415397 p += dst_linesize[plane];
416398 }
417399 } else {
418400 for (y = 0; y < h_sub; y++) {
419− blend_line16(p, color->comp[plane].u16[comp], alpha,
401+ blend_line16(p, color->comp[plane].u16[index], alpha,
420402 draw->pixelstep[plane], w_sub,
421403 draw->hsub[plane], left, right);
422404 p += dst_linesize[plane];
@@ -424,11 +406,11 @@ void ff_blend_rectangle(FFDrawContext *draw, FFDrawColor *color, · 1 unmodified line
424406 }
425407 if (bottom) {
426408 if (depth <= 8) {
427− blend_line(p, color->comp[plane].u8[comp], alpha >> 1,
409+ blend_line(p, color->comp[plane].u8[index], alpha >> 1,
428410 draw->pixelstep[plane], w_sub,
429411 draw->hsub[plane], left, right);
430412 } else {
431− blend_line16(p, color->comp[plane].u16[comp], alpha >> 1,
413+ blend_line16(p, color->comp[plane].u16[index], alpha >> 1,
432414 draw->pixelstep[plane], w_sub,
433415 draw->hsub[plane], left, right);
434416 }
@@ -544,6 +526,9 @@ void ff_blend_mask(FFDrawContext *draw, FFDrawColor *color, · 109 unmodified lines
544526 uint8_t *p0, *p;
545527 const uint8_t *m;
546528
529+ nb_comp = draw->desc->nb_components -
530+ !!(draw->desc->flags & AV_PIX_FMT_FLAG_ALPHA && !(draw->flags & FF_DRAW_PROCESS_ALPHA));
531+
547532 clip_interval(dst_w, &x0, &mask_w, &xm0);
548533 clip_interval(dst_h, &y0, &mask_h, &ym0);
549534 mask += ym0 * mask_linesize;
@@ -559,7 +544,6 @@ void ff_blend_mask(FFDrawContext *draw, FFDrawColor *color, · 9 unmodified lines
559544 nb_planes = draw->nb_planes - !!(draw->desc->flags & AV_PIX_FMT_FLAG_ALPHA && !(draw->flags & FF_DRAW_PROCESS_ALPHA));
560545 nb_planes += !nb_planes;
561546 for (plane = 0; plane < nb_planes; plane++) {
562− nb_comp = draw->pixelstep[plane];
563547 p0 = pointer_at(draw, dst, dst_linesize, plane, x0, y0);
564548 w_sub = mask_w;
565549 h_sub = mask_h;
@@ -569,21 +553,23 @@ void ff_blend_mask(FFDrawContext *draw, FFDrawColor *color, · 3 unmodified lines
569553 subsampling_bounds(draw->vsub[plane], &y_sub, &h_sub, &top, &bottom);
570554 for (comp = 0; comp < nb_comp; comp++) {
571555 const int depth = draw->desc->comp[comp].depth;
556+ const int offset = draw->desc->comp[comp].offset;
557+ const int index = offset / ((depth + 7) / 8);
572558
573− if (!component_used(draw, plane, comp))
559+ if (draw->desc->comp[comp].plane != plane)
574560 continue;
575− p = p0 + comp;
561+ p = p0 + offset;
576562 m = mask;
577563 if (top) {
578564 if (depth <= 8) {
579565 blend_line_hv(p, draw->pixelstep[plane],
580− color->comp[plane].u8[comp], alpha,
566+ color->comp[plane].u8[index], alpha,
581567 m, mask_linesize, l2depth, w_sub,
582568 draw->hsub[plane], draw->vsub[plane],
583569 xm0, left, right, top);
584570 } else {
585571 blend_line_hv16(p, draw->pixelstep[plane],
586− color->comp[plane].u16[comp], alpha,
572+ color->comp[plane].u16[index], alpha,
587573 m, mask_linesize, l2depth, w_sub,
588574 draw->hsub[plane], draw->vsub[plane],
589575 xm0, left, right, top);
@@ -594,7 +580,7 @@ void ff_blend_mask(FFDrawContext *draw, FFDrawColor *color, · 4 unmodified lines
594580 if (depth <= 8) {
595581 for (y = 0; y < h_sub; y++) {
596582 blend_line_hv(p, draw->pixelstep[plane],
597− color->comp[plane].u8[comp], alpha,
583+ color->comp[plane].u8[index], alpha,
598584 m, mask_linesize, l2depth, w_sub,
599585 draw->hsub[plane], draw->vsub[plane],
600586 xm0, left, right, 1 << draw->vsub[plane]);
@@ -604,7 +590,7 @@ void ff_blend_mask(FFDrawContext *draw, FFDrawColor *color, · 3 unmodified lines
604590 } else {
605591 for (y = 0; y < h_sub; y++) {
606592 blend_line_hv16(p, draw->pixelstep[plane],
607− color->comp[plane].u16[comp], alpha,
593+ color->comp[plane].u16[index], alpha,
608594 m, mask_linesize, l2depth, w_sub,
609595 draw->hsub[plane], draw->vsub[plane],
610596 xm0, left, right, 1 << draw->vsub[plane]);
@@ -615,13 +601,13 @@ void ff_blend_mask(FFDrawContext *draw, FFDrawColor *color, · 4 unmodified lines
615601 if (bottom) {
616602 if (depth <= 8) {
617603 blend_line_hv(p, draw->pixelstep[plane],
618− color->comp[plane].u8[comp], alpha,
604+ color->comp[plane].u8[index], alpha,
619605 m, mask_linesize, l2depth, w_sub,
620606 draw->hsub[plane], draw->vsub[plane],
621607 xm0, left, right, bottom);
622608 } else {
623609 blend_line_hv16(p, draw->pixelstep[plane],
624− color->comp[plane].u16[comp], alpha,
610+ color->comp[plane].u16[index], alpha,
625611 m, mask_linesize, l2depth, w_sub,
626612 draw->hsub[plane], draw->vsub[plane],
627613 xm0, left, right, bottom);
libavfilter/drawutils.h+0−1
@@ -37,7 +37,6 @@ typedef struct FFDrawContext { · 36 unmodified lines
3737 enum AVPixelFormat format;
3838 unsigned nb_planes;
3939 int pixelstep[MAX_PLANES]; /*< offset between pixels */
40− uint8_t comp_mask[MAX_PLANES]; /*< bitmask of used non-alpha components */
4140 uint8_t hsub[MAX_PLANES]; /*< horizontal subsampling */
4241 uint8_t vsub[MAX_PLANES]; /*< vertical subsampling */
4342 uint8_t hsub_max;
tests/ref/fate/filter-pixfmts-pad+10−10
@@ -1,8 +1,8 @@
1−0bgr 7bc6f5a1c44cdd7506174dccf52c68d7
2−0rgb ff12e0f1e576b47a4c962729d5c0b868
1+0bgr 55d41bba3609383bf658169f90b30b42
2+0rgb 8e076dd0f8a9f4652595dffe3544f0f0
33 abgr 52738042432893de555e6a3833172806
44 argb 2a10108ac524b422b8a2393c064b3eab
5−bgr0 32207a2de1b2ac7937e940a8459b97c0
5+bgr0 025d4d5e5691801ba39bc9de70e39df0
66 bgr24 f8b65ad845905c7d0c93ca28dfbb826f
77 bgra 929aac15e848038e367c250037575f9f
88 gbrap 5f16cccab5a17cb766c882e865995167
@@ -25,16 +25,16 @@ nv12 381574979cb04be10c9168540310afad · 16 unmodified lines
2525 nv21 0fdeb2cdd56cf5a7147dc273456fa217
2626 nv24 193b9eadcc06ad5081609f76249b3e47
2727 nv42 1738ad3c31c6c16e17679f5b09ce4677
28−p210le 10b53de63b086de93c076d1d40f9da42
29−p216le 0bbf778e1b6101a3f650ce0454a357f2
30−p410le fcab6381bde9cd84b813925ff29be4d2
31−p416le 6db094f8d7d27d7299bf9496ad66e2e0
32−rgb0 78d500c8361ab6423a4826a00268c908
28+p210le abc02945a9b9585f0914716e4787cefb
29+p216le 1b43feb94b8a030c0c699aa0deff017b
30+p410le 1f0294141ae1657d6c10c6a0d46a879f
31+p416le 320e558b7ee8d598231ae0763ecca275
32+rgb0 0984eb985dabbe757ed6beb53db84eff
3333 rgb24 17f9e2e0c609009acaf2175c42d4a2a5
3434 rgba b157c90191463d34fb3ce77b36c96386
3535 xyz12le 85abf80b77a9236a76ba0b00fcbdea2d
36−ya16le 940fafa240b9916de5f73cb20a552f24
37−ya8 5fc0f471207ddf7aa01b07027d56b672
36+ya16le d85740ba2cac9fa9ea8aaea8a5864407
37+ya8 495daaca2dcb4f7aeba7652768b41ced
3838 yuv410p cb871dcc1e84a7ef1d21f9237b88cf6e
3939 yuv411p aec2c1740de9a62db0d41f4dda9121b0
4040 yuv420p 4398e408fc35436ce4b20468946f58b6

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