mirror of
https://github.com/mpv-player/mpv
synced 2024-12-26 09:02:38 +00:00
80270218cb
Make more aspects of the OSD font customizable. This also affects the font used for unstyled subtitles (such as SRT), or when using the --no-ass option. This adds back some customizability that was lost with commit 74e7a1 (osd: use libass for OSD rendering). Removed options: --ass-border-color --ass-color --font --subfont --subfont-text-scale Added options: --osd-color --osd-border --osd-back-color --osd-shadow-color --osd-font --osd-font-size --osd-border-size --osd-margin-x --osd-margin-y --osd-shadow-offset --osd-spacing --sub-scale The font size is now specified in pixels as it would be rendered on a window with a height of 720 pixels. OSD and subtitles are always scaled with the window height, so specifying or expecting an absolute font size doesn't make sense. Such scaled pixel units are used to specify font border etc. as well. (Note: the font size is directly passed to libass. How the fonts are actually rasterized is outside of our control, but in theory ASS font sizes map to "script" pixels and then are scaled to screen size.) The default settings should be about the same, with slight difference due to rounding to the new scales. The OSD and subtitle fonts are not separately configurable. It has limited use and would double the number of newly added options, which would be more confusing than helpful. It could be easily added later, should the need arise. Other small details that change: - ASS_Style.Encoding is not set to -1 for subs anymore (assuming subs use VSFilter direction in -no-ass mode too) - use a different WrapStyle for OSD - ASS forced styles are not applied to OSD
82 lines
2.5 KiB
C
82 lines
2.5 KiB
C
/*
|
|
* 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>
|
|
#include <stdbool.h>
|
|
|
|
#include "config.h"
|
|
#include "subreader.h"
|
|
|
|
// font sizes and explicit tags in subassconvert.c assume this size (?)
|
|
#define MP_ASS_FONT_PLAYRESY 288
|
|
|
|
#define MP_ASS_RGBA(r, g, b, a) \
|
|
(((r) << 24U) | ((g) << 16) | ((b) << 8) | (0xFF - (a)))
|
|
|
|
// m_color argument
|
|
#define MP_ASS_COLOR(c) MP_ASS_RGBA((c).r, (c).g, (c).b, (c).a)
|
|
|
|
#ifdef CONFIG_ASS
|
|
#include <ass/ass.h>
|
|
#include <ass/ass_types.h>
|
|
|
|
struct MPOpts;
|
|
struct mp_osd_res;
|
|
struct osd_style_opts;
|
|
|
|
void mp_ass_set_style(ASS_Style *style, struct osd_style_opts *opts);
|
|
|
|
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);
|
|
ASS_Track *mp_ass_read_stream(ASS_Library *library, const char *fname,
|
|
char *charset);
|
|
|
|
struct MPOpts;
|
|
void mp_ass_configure(ASS_Renderer *priv, struct MPOpts *opts,
|
|
struct mp_osd_res *dim);
|
|
void mp_ass_configure_fonts(ASS_Renderer *priv, struct osd_style_opts *opts);
|
|
ASS_Library *mp_ass_init(struct MPOpts *opts);
|
|
|
|
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);
|
|
|
|
#else /* CONFIG_ASS */
|
|
|
|
/* Needed for OSD 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;
|
|
} ASS_Image;
|
|
|
|
#endif
|
|
|
|
#endif /* MPLAYER_ASS_MP_H */
|