[MPlayer-cvslog] CVS: main/libvo sub.c,1.76,1.77

[Jindrich Makovicka]

D Richard Felker III wrote:
> On Sun, Apr 10, 2005 at 12:25:35AM +0200, Jindrich Makovicka CVS wrote:
> 
>>CVS change done by Jindrich Makovicka CVS
>>
>>Update of /cvsroot/mplayer/main/libvo
>>In directory mail:/var2/tmp/cvs-serv29822
>>
>>Modified Files:
>>	sub.c 
>>Log Message:
>>reload font on each change of the display size
>>
>>Index: sub.c
>>===================================================================
>>RCS file: /cvsroot/mplayer/main/libvo/sub.c,v
>>retrieving revision 1.76
>>retrieving revision 1.77
>>diff -u -r1.76 -r1.77
>>--- sub.c	28 Oct 2004 01:15:52 -0000	1.76
>>+++ sub.c	9 Apr 2005 22:25:33 -0000	1.77
>>@@ -764,7 +764,10 @@
>> 
>> #ifdef HAVE_FREETYPE    
>>     // here is the right place to get screen dimensions
>>-    if (!vo_font || force_load_font) {
>>+    if (!vo_font
>>+	|| force_load_font
>>+	|| ((dxs != vo_image_width || dys != vo_image_height)
>>+	   && (subtitle_autoscale == 2 || subtitle_autoscale == 3))) {
>> 	force_load_font = 0;
>> 	load_font_ft(dxs, dys);
>>     }
> 
> 
> Does this force reloading when fullscreen is toggled? (Before or now?)
> Sometimes my MPlayer freezes up for a moment when toggling fullscreen,
> and I think it's rereading the font file from disk, which is totally
> unnecessary since I'm using vo_mga... If this is the case, is there a
> way to avoid it?

Does vo_mga draw the font in the source image (like vo_xv), or in the
screen resolution (like vo_gl/sdl) ? In the first case, loading a font
(without panscan) is a bug. In the second case it is a feature.

You can also disable font scaling by -subfont-autoscale 0 or scale to
movie height (-subfont-autoscale 1).

-- 
Jindrich Makovicka