diff options
| author | wm4 <wm4@nowhere> | 2016-07-03 19:11:33 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-07-03 19:32:31 +0200 |
| commit | 37cf92c07a7d664907ede87e9464680cc36bd5ec (patch) | |
| tree | 85c5cab0abfe7791e1539b2a1ee6db9a1e5897cc /sub/img_convert.h | |
| parent | 59972fbfe119cd09b59cba8b9553acf0a6e5c035 (diff) | |
| download | mpv-37cf92c07a7d664907ede87e9464680cc36bd5ec.tar.bz2 mpv-37cf92c07a7d664907ede87e9464680cc36bd5ec.tar.xz | |
sub: change how libass output is converted to RGBA in some cases
This affects VOs (or other code which render OSD) which does not support
the LIBASS format, but only RGBA. Instead of having a converter stage in
osd.c, make mp_ass_packer_pack() output directly in RGBA.
In general, this is work towards refcounted subtitle images.
Although we could keep the "converter" design, doing it this way seems
simpler, at least considering the current situation with only 2 OSD
formats. It also prevents copying & packing the data twice, which will
lead to better performance. (Although I guess this case is not important
at all.)
It also fixes --force-rgba-osd-rendering when used with vo_opengl,
vo_vdpau, and vo_direct3d.
Diffstat (limited to 'sub/img_convert.h')
| -rw-r--r-- | sub/img_convert.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sub/img_convert.h b/sub/img_convert.h index a0020df497..bf228a1f65 100644 --- a/sub/img_convert.h +++ b/sub/img_convert.h @@ -10,9 +10,6 @@ struct mp_rect; struct osd_conv_cache *osd_conv_cache_new(void); -// These functions convert from one OSD format to another. On success, they copy -// the converted image data into c, and change imgs to point to the data. -bool osd_conv_ass_to_rgba(struct osd_conv_cache *c, struct sub_bitmaps *imgs); // Sub postprocessing void mp_blur_rgba_sub_bitmap(struct sub_bitmap *d, double gblur); bool osd_scale_rgba(struct osd_conv_cache *c, struct sub_bitmaps *imgs); |