diff options
author | wm4 <wm4@nowhere> | 2012-10-07 22:02:03 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-10-24 21:56:33 +0200 |
commit | fd5c4a19849b768986a0e652bb2f398c922f42dd (patch) | |
tree | 8a4092652c4e79bc0b01f13bab6d6b3d0984ef26 /sub/sub.h | |
parent | 7b203b5e05d9873e279f8432d4ffb3d9facc5e23 (diff) | |
download | mpv-fd5c4a19849b768986a0e652bb2f398c922f42dd.tar.bz2 mpv-fd5c4a19849b768986a0e652bb2f398c922f42dd.tar.xz |
Remove things related to old OSD
To ease changing all the VOs to the new OSD rendering, fallbacks,
conversions, support code etc. was left all over the code. Now that
all VOs have been changed, all that code is inactive. Remove it.
Strip down spudec.c. We don't need the old grayscale and scaling stuff
anymore. (Not removing spudec itself yet - I'm not confident that the
libavcodec DVD sub decoder is sufficient, and it would also require
some hacks to get DVD palette and resolution information from libdvdread
to libavcodec.)
The option --spuaa, --spualign, --spugauss were used with the old sub
scaling code, and don't do anything anymore.
Diffstat (limited to 'sub/sub.h')
-rw-r--r-- | sub/sub.h | 24 |
1 files changed, 0 insertions, 24 deletions
@@ -32,7 +32,6 @@ enum sub_bitmap_format { SUBBITMAP_LIBASS, // A8, with a per-surface blend color (libass.color) SUBBITMAP_RGBA, // B8G8R8A8 (MSB=A, LSB=B), scaled, premultiplied alpha SUBBITMAP_INDEXED, // scaled, bitmap points to osd_bmp_indexed - SUBBITMAP_OLD_PLANAR, // like previous, but bitmap points to old_osd_planar SUBBITMAP_COUNT }; @@ -44,12 +43,6 @@ struct osd_bmp_indexed { uint32_t palette[256]; }; -// For SUBBITMAP_OLD_PANAR -struct old_osd_planar { - unsigned char *bitmap; - unsigned char *alpha; -}; - struct sub_bitmap { void *bitmap; int stride; @@ -191,9 +184,6 @@ extern int sub_pos; extern int sub_width_p; extern int sub_bg_color; /* subtitles background color */ extern int sub_bg_alpha; -extern int spu_alignment; -extern int spu_aamode; -extern float spu_gaussvar; extern char *subtitle_font_encoding; extern float text_font_scale_factor; @@ -210,20 +200,6 @@ extern float sub_fps; extern int sub_justify; -void osd_draw_text(struct osd_state *osd, int dxs, int dys, - void (*draw_alpha)(void *ctx, int x0, int y0, int w, int h, - unsigned char* src, unsigned char *srca, - int stride), - void *ctx); -void osd_draw_text_ext(struct osd_state *osd, int dxs, int dys, - int left_border, int top_border, int right_border, - int bottom_border, int orig_w, int orig_h, - void (*draw_alpha)(void *ctx, int x0, int y0, int w, - int h, unsigned char* src, - unsigned char *srca, - int stride), - void *ctx); - void draw_osd_with_eosd(struct vo *vo, struct osd_state *osd); struct osd_state *osd_create(struct MPOpts *opts, struct ass_library *asslib); |