summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authoreugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-04-27 14:25:36 +0000
committereugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-04-27 14:25:36 +0000
commitc67220c86fa6267d8e0aa5b69d0eebbe17e0ede2 (patch)
treeb8e7d650db0b09986770f59af665319b048f38e7 /libmpcodecs
parent13156cd7946705c89ad04edba05c6434d1675e46 (diff)
downloadmpv-c67220c86fa6267d8e0aa5b69d0eebbe17e0ede2.tar.bz2
mpv-c67220c86fa6267d8e0aa5b69d0eebbe17e0ede2.tar.xz
Add -ass-hinting option for setting font hinting method.
It is possible to separately configure hinting for scaled and unscaled osd. The default is native hinter for unscaled osd (only vo_gl at this point), no hinting for vf_ass. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23152 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/vf_ass.c2
-rw-r--r--libmpcodecs/vf_vo.c4
-rw-r--r--libmpcodecs/vfcap.h3
3 files changed, 5 insertions, 4 deletions
diff --git a/libmpcodecs/vf_ass.c b/libmpcodecs/vf_ass.c
index 63355bff0f..f88ed99eca 100644
--- a/libmpcodecs/vf_ass.c
+++ b/libmpcodecs/vf_ass.c
@@ -92,7 +92,7 @@ static int config(struct vf_instance_s* vf,
vf->priv->dirty_rows = malloc(vf->priv->outh);
if (vf->priv->ass_priv) {
- ass_configure(vf->priv->ass_priv, vf->priv->outw, vf->priv->outh);
+ ass_configure(vf->priv->ass_priv, vf->priv->outw, vf->priv->outh, 0);
ass_set_aspect_ratio(vf->priv->ass_priv, ((double)d_width) / d_height);
}
diff --git a/libmpcodecs/vf_vo.c b/libmpcodecs/vf_vo.c
index 9d320cf855..fc1ca92d42 100644
--- a/libmpcodecs/vf_vo.c
+++ b/libmpcodecs/vf_vo.c
@@ -60,14 +60,14 @@ static int config(struct vf_instance_s* vf,
}
// save vo's stride capability for the wanted colorspace:
- vf->default_caps=query_format(vf,outfmt) & VFCAP_ACCEPT_STRIDE;
+ vf->default_caps=query_format(vf,outfmt);
if(config_video_out(video_out,width,height,d_width,d_height,flags,"MPlayer",outfmt))
return 0;
#ifdef USE_ASS
if (vf->priv->ass_priv)
- ass_configure(vf->priv->ass_priv, width, height);
+ ass_configure(vf->priv->ass_priv, width, height, !!(vf->default_caps & VFCAP_EOSD_UNSCALED));
#endif
++vo_config_count;
diff --git a/libmpcodecs/vfcap.h b/libmpcodecs/vfcap.h
index 9c2288e8a3..0cc9c4ec4d 100644
--- a/libmpcodecs/vfcap.h
+++ b/libmpcodecs/vfcap.h
@@ -28,4 +28,5 @@
#define VFCAP_CONSTANT 0x1000
// filter can draw EOSD
#define VFCAP_EOSD 0x2000
-
+// filter will draw EOSD at screen resolution (without scaling)
+#define VFCAP_EOSD_UNSCALED 0x4000