path: root/sub/sd_ass.c
diff options
authorUoti Urpala <>2012-08-31 15:42:30 +0300
committerwm4 <wm4@nowhere>2012-09-18 21:07:30 +0200
commit1959ba006ce1a4591f3dcd5093901993e3fdda5f (patch)
tree93fcd19aa07e47cddb875b1ca714ae69a453c8e8 /sub/sd_ass.c
parentae9c3d530c55e86eb54d8cf23a23c5ce6301ec6e (diff)
subs, vo_vdpau: support RGBA color for PGS subtitles
Support passing bitmap subtitles to VOs in full RGBA color, and implement this for libavcodec-decoded subtitle formats on decoding side and vo_vdpau on display side. Currently this is enabled for PGS (blu-ray) and DVB subtitles. VDPAU seems to have sampling issues similar to known GL ones when drawing a sub-rectangle from a larger texture with scaling, where adjacent pixels outside the specified source rectangle affect the result. As the bitmap subtitles may be scaled, add padding support to the bitmap packer code. In principle, this could be used for colored DVD subtitles too. However, the libavcodec DVD decoder lacks parts of the resolution and palette handling that are present in spudec.c. Conflicts: libvo/vo_gl.c sub/dec_sub.h sub/sd_lavc.c
Diffstat (limited to 'sub/sd_ass.c')
1 files changed, 1 insertions, 0 deletions
diff --git a/sub/sd_ass.c b/sub/sd_ass.c
index 37c220a4b5..9295cab07d 100644
--- a/sub/sd_ass.c
+++ b/sub/sd_ass.c
@@ -147,6 +147,7 @@ static void get_bitmaps(struct sh_sub *sh, struct osd_state *osd,
res->bitmap_id = ++res->bitmap_pos_id;
else if (changed)
+ res->type = SUBBITMAP_LIBASS;
static void reset(struct sh_sub *sh, struct osd_state *osd)