RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity
mpv/sub/ass_mp.h

70 lines
2.1 KiB
C
Raw Normal View History

Remove internal libass tree Remove the libass/ directory and use the newest standalone version of the library instead.
2009-07-25 04:24:39 +00:00
/*
* Copyright (C) 2006 Evgeniy Stepanov <eugeni.stepanov@gmail.com>
*
* This file is part of MPlayer.
*
* MPlayer is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* MPlayer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with libass; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef MPLAYER_ASS_MP_H
#define MPLAYER_ASS_MP_H
#include <stdint.h>
cleanup: some random minor code simplification and cleanup
2011-01-19 16:00:22 +00:00
#include <stdbool.h>
Remove internal libass tree Remove the libass/ directory and use the newest standalone version of the library instead.
2009-07-25 04:24:39 +00:00
ass_mp.[ch]: #include "config.h" It was indirectly included through subreader.h but better do it explicitly. ass_mp.h also included itself, remove that.
2010-10-30 16:39:40 +00:00
#include "config.h"
Remove internal libass tree Remove the libass/ directory and use the newest standalone version of the library instead.
2009-07-25 04:24:39 +00:00
#include "subreader.h"
#ifdef CONFIG_ASS
#include <ass/ass.h>
#include <ass/ass_types.h>
subs: libass: use a single persistent renderer for subtitles 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
2012-08-25 14:47:50 +00:00
struct MPOpts;
struct mp_eosd_res;
options: move libass-related options to struct
2011-09-03 10:47:56 +00:00
ASS_Track *mp_ass_default_track(ASS_Library *library, struct MPOpts *opts);
ASS_Track *mp_ass_read_subdata(ASS_Library *library, struct MPOpts *opts,
sub_data *subdata, double fps);
cleanup: rename ass_* functions to mp_ass_* The various ass_* functions were created when libass was part of the MPlayer tree and the distinction between MPlayer-specific and other functions was less clear. Now that libass is a clearly separate library, using the same ass_* namespace for player functions is ugly. Rename the functions to use mp_ass_ prefix instead.
2011-01-20 16:47:18 +00:00
ASS_Track *mp_ass_read_stream(ASS_Library *library, const char *fname,
char *charset);
Remove internal libass tree Remove the libass/ directory and use the newest standalone version of the library instead.
2009-07-25 04:24:39 +00:00
options: move libass-related options to struct
2011-09-03 10:47:56 +00:00
struct MPOpts;
subs: libass: use a single persistent renderer for subtitles 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
2012-08-25 14:47:50 +00:00
void mp_ass_configure(ASS_Renderer *priv, struct MPOpts *opts,
sub: remove logic for disabling hinting on scaled EOSD This was an extremely obscure setting, as it was used only with vo_gl if its scaled-osd suboption was used. If you really want this, you can set the desired ass-hinting value directly, and there will be literally no loss in functionality. Note that this didn't actually test whether the EOSD was scaled. Basically, it only checked whether vo_gl had the scaled-osd suboption set.
2012-10-03 15:00:37 +00:00
struct mp_eosd_res *dim);
cleanup: rename ass_* functions to mp_ass_* The various ass_* functions were created when libass was part of the MPlayer tree and the distinction between MPlayer-specific and other functions was less clear. Now that libass is a clearly separate library, using the same ass_* namespace for player functions is ugly. Rename the functions to use mp_ass_ prefix instead.
2011-01-20 16:47:18 +00:00
void mp_ass_configure_fonts(ASS_Renderer *priv);
options: move libass-related options to struct
2011-09-03 10:47:56 +00:00
ASS_Library *mp_ass_init(struct MPOpts *opts);
Remove internal libass tree Remove the libass/ directory and use the newest standalone version of the library instead.
2009-07-25 04:24:39 +00:00
sub: allow rendering OSD in ASS image format directly, simplify Before this commit, the OSD was drawn using libass, but the resulting bitmaps were converted to the internal mplayer OSD format. We want to get rid of the old OSD format, because it's monochrome, and can't even be rendered directly using modern video output methods (like with OpenGL/Direct3D/VDPAU). Change it so that VOs can get the ASS images directly, without additional conversions. (This also has the consequence that the OSD can render colors now.) Currently, this is vo_gl3 only. The other VOs still use the old method. Also, the old OSD format is still used for all VOs with DVD subtitles (spudec). Rewrite sub.c. Remove all the awkward flags and bounding boxes and change detection things. It turns out that much of that isn't needed. Move code related to converting subtitle images to img_convert.c. (It has to be noted that all of these conversions were already done before in some places, and that the new code actually makes less use of them.)
2012-09-28 19:38:52 +00:00
struct sub_bitmap;
struct sub_bitmaps;
void mp_ass_render_frame(ASS_Renderer *renderer, ASS_Track *track, double time,
struct sub_bitmap **parts, struct sub_bitmaps *res);
Remove internal libass tree Remove the libass/ directory and use the newest standalone version of the library instead.
2009-07-25 04:24:39 +00:00
#else /* CONFIG_ASS */
/* Needed for EOSD code using this type to compile */
typedef struct ass_image {
int w, h;
int stride;
unsigned char *bitmap;
uint32_t color;
int dst_x, dst_y;
struct ass_image *next;
Change type names to match upstream libass
2009-08-06 20:58:31 +00:00
} ASS_Image;
Remove internal libass tree Remove the libass/ directory and use the newest standalone version of the library instead.
2009-07-25 04:24:39 +00:00
#endif
#endif /* MPLAYER_ASS_MP_H */