diff options
author | Niklas Haas <git@nand.wakku.to> | 2015-03-23 02:42:19 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-03-26 00:04:03 +0100 |
commit | 8c43e12b20a52dc61b53bc3eec779aa07b8c8220 (patch) | |
tree | 43edfc813c01137011ea917e329a3ec2ef2889ee /video/out/gl_osd.c | |
parent | a67494e86b7261f59a3a6a3f3e6b1fe0a257bf4f (diff) | |
download | mpv-8c43e12b20a52dc61b53bc3eec779aa07b8c8220.tar.bz2 mpv-8c43e12b20a52dc61b53bc3eec779aa07b8c8220.tar.xz |
vo_opengl: draw subtitles directly onto the video
This has a number of user-visible changes:
1. A new flag blend-subtitles (default on for opengl-hq) to control this
behavior.
2. The OSD itself will not be color managed or affected by
gamma controls. To get subtitle CMS/gamma, blend-subtitles must be
used.
3. When enabled, this will make subtitles be cleanly interpolated by
:interpolation, and also dithered etc. (just like the normal output).
Signed-off-by: wm4 <wm4@nowhere>
Diffstat (limited to 'video/out/gl_osd.c')
-rw-r--r-- | video/out/gl_osd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/video/out/gl_osd.c b/video/out/gl_osd.c index 88a7e938fb..9ec4350a03 100644 --- a/video/out/gl_osd.c +++ b/video/out/gl_osd.c @@ -401,7 +401,7 @@ struct gl_vao *mpgl_osd_get_vao(struct mpgl_osd *ctx) } void mpgl_osd_generate(struct mpgl_osd *ctx, struct mp_osd_res res, double pts, - int stereo_mode) + int stereo_mode, int draw_flags) { for (int n = 0; n < MAX_OSD_PARTS; n++) ctx->parts[n]->num_subparts = 0; @@ -413,6 +413,6 @@ void mpgl_osd_generate(struct mpgl_osd *ctx, struct mp_osd_res res, double pts, ctx->display_size[0] = s_res.w = s_res.w / div[0]; ctx->display_size[1] = s_res.h = s_res.h / div[1]; - osd_draw(ctx->osd, s_res, pts, 0, ctx->formats, gen_osd_cb, ctx); + osd_draw(ctx->osd, s_res, pts, draw_flags, ctx->formats, gen_osd_cb, ctx); ctx->stereo_mode = stereo_mode; } |