mirror of
https://github.com/mpv-player/mpv.git
synced 2024-09-20 12:02:23 +02:00
9bb03b7db4
To draw libass subtitles, the code used ASS_Renderer objects created in vf_vo (VO rendering) or vf_ass. They were destroyed and recreated together with the video filter chain. Change the code to use a single persistent renderer instance stored in the main osd_state struct. Because libass seems to misbehave if fonts are changed while a renderer exists (even if ass_set_fonts() is called on the renderer afterwards), the renderer is recreated after adding embedded fonts. The known benefits are simpler code and avoiding delays when switching between timeline parts from different files (libass fontconfig initialization, needed when creating a new renderer, can take a long time in some cases; switching between files rebuilds the video filter chain, and this required recreating the renderers). On the other hand, I'm not sure whether this could cause inefficient bitmap caching in libass; explicitly resetting the renderer in some cases could be beneficial. The new code does not keep the distinction of separate renderers for vsfilter munged aspect vs normal; this means that changing subtitle tracks can lose cache for the previous track. The new code always sets some libass parameters on each rendering call, which were previously only set if they had potentially changed. This should be harmless as libass itself has checks to see if the values differ from previous ones. Conflicts: command.c libmpcodecs/vf_ass.c libmpcodecs/vf_vo.c mplayer.c sub/ass_mp.c
25 lines
707 B
C
25 lines
707 B
C
#ifndef MPLAYER_DEC_SUB_H
|
|
#define MPLAYER_DEC_SUB_H
|
|
|
|
struct sh_sub;
|
|
struct osd_state;
|
|
|
|
typedef struct mp_eosd_res {
|
|
int w, h; // screen dimensions, including black borders
|
|
int mt, mb, ml, mr; // borders (top, bottom, left, right)
|
|
} mp_eosd_res_t;
|
|
|
|
static inline bool is_text_sub(int type)
|
|
{
|
|
return type == 't' || type == 'm' || type == 'a';
|
|
}
|
|
|
|
void sub_decode(struct sh_sub *sh, struct osd_state *osd, void *data,
|
|
int data_len, double pts, double duration);
|
|
void sub_init(struct sh_sub *sh, struct osd_state *osd);
|
|
void sub_reset(struct sh_sub *sh, struct osd_state *osd);
|
|
void sub_switchoff(struct sh_sub *sh, struct osd_state *osd);
|
|
void sub_uninit(struct sh_sub *sh);
|
|
|
|
#endif
|