diff options
author | wm4 <wm4@nowhere> | 2012-10-04 17:16:47 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-10-16 07:26:32 +0200 |
commit | 3ad918bbc62449759bbf97f6a809ebdde27ad59e (patch) | |
tree | 24c3668687c5ebff37d6d1aaa0354d01310a0d8d /sub/dec_sub.c | |
parent | cc05910f16a5ccd8e3dca26a89e9c3835cbdb645 (diff) | |
download | mpv-3ad918bbc62449759bbf97f6a809ebdde27ad59e.tar.bz2 mpv-3ad918bbc62449759bbf97f6a809ebdde27ad59e.tar.xz |
sub: never decode subs to old OSD format
Instead, sd_lavc.c and spudec.c (the two image sub decoders) always
output indexed/paletted images. For this purpose, add SUBBITMAP_INDEXED,
and convert the subs to RGBA in img_convert.c instead. If a VO is used
that supports the old OSD format only, the indexed bitmaps are converted
to the old OSD format by abusing spudec.c in a similar way sd_lavc.c
used to do.
The main reason why spudec.c is used is because the images must not only
be converted to the old format, but also properly scaled, cropped, and
aligned (the asm code in libvo/osd.c requires this alignment).
Remove support for the old format (packed variant) from the OpenGL VOs.
(The packed formats were how the actual OSD format was handled in some
GPU-driven VOs for a while.)
Remove all conversions from old to new formats. Now all subtitle
decoders and OSD renderers produce the new formats only.
Add an evil hack to convert the new format (scaled+indexed bitmaps) to
the old format. It creates a new spudec instance to convert images to
grayscale and to scale them. This is temporary for VOs which don't
support new OSD formats yet (vo_xv, vo_x11, vo_lavc).
Diffstat (limited to 'sub/dec_sub.c')
-rw-r--r-- | sub/dec_sub.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sub/dec_sub.c b/sub/dec_sub.c index 87cb9870cb..09d9989494 100644 --- a/sub/dec_sub.c +++ b/sub/dec_sub.c @@ -63,9 +63,6 @@ void sub_get_bitmaps(struct osd_state *osd, struct sub_render_params *params, { struct MPOpts *opts = osd->opts; - // temporary hack - osd->support_rgba = params->support_rgba; - *res = (struct sub_bitmaps) {0}; if (!opts->sub_visibility || !osd->sh_sub || !osd->sh_sub->active) { /* Change ID in case we just switched from visible subtitles |