diff options
author | wm4 <wm4@nowhere> | 2012-10-05 20:37:16 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-10-16 07:26:32 +0200 |
commit | 44c62a685222f2b018a480246c2946d3e3e7529c (patch) | |
tree | 0c603432a889a4c6c549d8ee0f5cb5222586b7a0 /sub | |
parent | 3ad918bbc62449759bbf97f6a809ebdde27ad59e (diff) | |
download | mpv-44c62a685222f2b018a480246c2946d3e3e7529c.tar.bz2 mpv-44c62a685222f2b018a480246c2946d3e3e7529c.tar.xz |
sub: switch to premultiplied alpha
Fixes problems with ugly borders.
Note that at least in the DVD sub case, we could have just set all
transparent pixels to black to solve this.
vo_direct3d.c change untested, because mingw is a miserable pile of
crap.
Diffstat (limited to 'sub')
-rw-r--r-- | sub/img_convert.c | 24 | ||||
-rw-r--r-- | sub/sub.h | 2 |
2 files changed, 21 insertions, 5 deletions
diff --git a/sub/img_convert.c b/sub/img_convert.c index b8a769f052..888380cf70 100644 --- a/sub/img_convert.c +++ b/sub/img_convert.c @@ -166,6 +166,21 @@ bool osd_conv_ass_to_old_p(struct osd_conv_cache *c, struct sub_bitmaps *imgs) return true; } +static void rgba_to_premultiplied_rgba(uint32_t *colors, size_t count) +{ + for (int n = 0; n < count; n++) { + uint32_t c = colors[n]; + int b = c & 0xFF; + int g = (c >> 8) & 0xFF; + int r = (c >> 16) & 0xFF; + int a = (c >> 24) & 0xFF; + b = b * a / 255; + g = g * a / 255; + r = r * a / 255; + colors[n] = b | (g << 8) | (r << 16) | (a << 24); + } +} + bool osd_conv_idx_to_rgba(struct osd_conv_cache *c, struct sub_bitmaps *imgs) { struct sub_bitmaps src = *imgs; @@ -179,18 +194,19 @@ bool osd_conv_idx_to_rgba(struct osd_conv_cache *c, struct sub_bitmaps *imgs) for (int n = 0; n < src.num_parts; n++) { struct sub_bitmap *d = &imgs->parts[n]; struct sub_bitmap *s = &src.parts[n]; - struct osd_bmp_indexed *sb = s->bitmap; + struct osd_bmp_indexed sb = *(struct osd_bmp_indexed *)s->bitmap; + + rgba_to_premultiplied_rgba(sb.palette, 256); *d = *s; d->stride = s->w * 4; d->bitmap = talloc_size(c->parts, s->h * d->stride); - uint32_t *palette = sb->palette; uint32_t *outbmp = d->bitmap; for (int y = 0; y < s->h; y++) { - uint8_t *inbmp = sb->bitmap + y * s->stride; + uint8_t *inbmp = sb.bitmap + y * s->stride; for (int x = 0; x < s->w; x++) - *outbmp++ = palette[*inbmp++]; + *outbmp++ = sb.palette[*inbmp++]; } } return true; @@ -30,7 +30,7 @@ struct sub_render_params; enum sub_bitmap_format { SUBBITMAP_EMPTY = 0,// no bitmaps; always has num_parts==0 SUBBITMAP_LIBASS, // A8, with a per-surface blend color (libass.color) - SUBBITMAP_RGBA, // B8G8R8A8 (MSB=A, LSB=B), can be scaled + SUBBITMAP_RGBA, // B8G8R8A8 (MSB=A, LSB=B), scaled, premultiplied alpha SUBBITMAP_INDEXED, // scaled, bitmap points to osd_bmp_indexed SUBBITMAP_OLD_PLANAR, // like previous, but bitmap points to old_osd_planar |