mirror of https://github.com/mpv-player/mpv
74e7a1e937
The OSD will now be rendered with libass. The old rendering code, which used freetype/fontconfig and did text layout manually, is disabled. To re-enable the old code, use the --disable-libass-osd configure switch. Some switches do nothing with the new code enabled, such as -subalign, -sub-bg-alpha, -sub-bg-color, and many more. (The reason is mostly that the code for rendering unstyled subtitles with libass doesn't make any attempts to support them. Some of them could be supported in theory.) Teletext rendering is not implemented in the new OSD rendering code. I don't have any teletext sources for testing, and since teletext is being phased out world-wide, the need for this is questionable. Note that rendering is extremely inefficient, mostly because the libass output is blended with the extremely strange mplayer OSD format. This could be improved at a later point. Remove most OSD rendering from vo_aa.c, because that was extremely hacky, can't be made work with osd_libass, and didn't work anyway in my tests. Internally, some cleanup is done. Subtitle and OSD related variable declarations were literally all over the place. Move them to sub.h and sub.c, which were hoarding most of these declarations already. Make the player core in mplayer.c free of concerns like bitmap font loading. The old OSD rendering code has been moved to osd_ft.c. The font_load.c and font_load_ft.c are only needed and compiled if the old OSD rendering code is configured. |
||
|---|---|---|
| .. | ||
| aclib.c | ||
| aclib_template.c | ||
| aspect.c | ||
| aspect.h | ||
| cocoa_common.h | ||
| cocoa_common.m | ||
| csputils.c | ||
| csputils.h | ||
| d3d_shader_yuv.h | ||
| d3d_shader_yuv.hlsl | ||
| d3d_shader_yuv_2ch.h | ||
| eosd_packer.c | ||
| eosd_packer.h | ||
| fastmemcpy.h | ||
| filter_kernels.c | ||
| filter_kernels.h | ||
| geometry.c | ||
| geometry.h | ||
| gl_common.c | ||
| gl_common.h | ||
| gl_header_fixes.h | ||
| old_vo_defines.h | ||
| old_vo_wrapper.c | ||
| old_vo_wrapper.h | ||
| osd.c | ||
| osd.h | ||
| osd_template.c | ||
| osx_common.c | ||
| osx_common.h | ||
| video_out.c | ||
| video_out.h | ||
| video_out_internal.h | ||
| videodev_mjpeg.h | ||
| vo_caca.c | ||
| vo_corevideo.h | ||
| vo_corevideo.m | ||
| vo_direct3d.c | ||
| vo_directfb2.c | ||
| vo_directx.c | ||
| vo_gif89a.c | ||
| vo_gl.c | ||
| vo_gl3.c | ||
| vo_gl3_shaders.glsl | ||
| vo_jpeg.c | ||
| vo_md5sum.c | ||
| vo_null.c | ||
| vo_png.c | ||
| vo_pnm.c | ||
| vo_sharedbuffer.h | ||
| vo_sharedbuffer.m | ||
| vo_tga.c | ||
| vo_v4l2.c | ||
| vo_v4l2.h | ||
| vo_vdpau.c | ||
| vo_x11.c | ||
| vo_xv.c | ||
| vo_yuv4mpeg.c | ||
| w32_common.c | ||
| w32_common.h | ||
| x11_common.c | ||
| x11_common.h | ||