summaryrefslogtreecommitdiffstats
path: root/sub
diff options
context:
space:
mode:
authorNiklas Haas <git@nand.wakku.to>2015-03-23 02:42:19 +0100
committerwm4 <wm4@nowhere>2015-03-26 00:04:03 +0100
commit8c43e12b20a52dc61b53bc3eec779aa07b8c8220 (patch)
tree43edfc813c01137011ea917e329a3ec2ef2889ee /sub
parenta67494e86b7261f59a3a6a3f3e6b1fe0a257bf4f (diff)
downloadmpv-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 'sub')
-rw-r--r--sub/osd.c2
-rw-r--r--sub/osd.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/sub/osd.c b/sub/osd.c
index 7ab191191a..75e76ad0fd 100644
--- a/sub/osd.c
+++ b/sub/osd.c
@@ -332,6 +332,8 @@ void osd_draw(struct osd_state *osd, struct mp_osd_res res,
continue;
if ((draw_flags & OSD_DRAW_SUB_ONLY) && !obj->is_sub)
continue;
+ if ((draw_flags & OSD_DRAW_OSD_ONLY) && obj->is_sub)
+ continue;
if (obj->sub_state.dec_sub)
sub_lock(obj->sub_state.dec_sub);
diff --git a/sub/osd.h b/sub/osd.h
index 704a424c4c..f67b6a5f14 100644
--- a/sub/osd.h
+++ b/sub/osd.h
@@ -180,6 +180,7 @@ void osd_set_nav_highlight(struct osd_state *osd, void *priv);
enum mp_osd_draw_flags {
OSD_DRAW_SUB_FILTER = (1 << 0),
OSD_DRAW_SUB_ONLY = (1 << 1),
+ OSD_DRAW_OSD_ONLY = (1 << 2),
};
void osd_draw(struct osd_state *osd, struct mp_osd_res res,