Ticket #340: MPlayer-1.0pre7-subfont-ratio.diff

cfg-common.h

@@ -278 +278 @@
         {"subfont-blur", &subtitle_font_radius, CONF_TYPE_FLOAT, CONF_RANGE, 0, 8, NULL},
         {"subfont-outline", &subtitle_font_thickness, CONF_TYPE_FLOAT, CONF_RANGE, 0, 8, NULL},
         {"subfont-autoscale", &subtitle_autoscale, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL},
+        {"subfont-ratio", &subtitle_font_ratio, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 100.0, NULL },
 #endif
 #ifdef HAVE_FONTCONFIG
         {"fontconfig", &font_fontconfig, CONF_TYPE_FLAG, 0, 0, 1, NULL},

libvo/font_load.h

@@ -70 +70 @@
 extern float osd_font_scale_factor;
 extern float subtitle_font_radius;
 extern float subtitle_font_thickness;
+extern float subtitle_font_ratio;
 extern int subtitle_autoscale;
 
 extern int vo_image_width;

libvo/font_load_ft.c

@@ -45 +45 @@
 float osd_font_scale_factor = 6.0;
 float subtitle_font_radius = 2.0;
 float subtitle_font_thickness = 2.0;
+float subtitle_font_ratio = 1.0;
 // 0 = no autoscale
 // 1 = video height
 // 2 = video width
@@ -123 +124 @@
     int         width, height;
     unsigned char *bbuffer;
     int i, uni_charmap = 1;
+    float xppem = ppem, yppem = ppem * subtitle_font_ratio;
     
     error = FT_Select_Charmap(face, ft_encoding_unicode);
 //    fprintf(stderr, "select unicode charmap: %d\n", error);
@@ -136 +138 @@
 
     /* set size */
     if (FT_IS_SCALABLE(face)) {
-        error = FT_Set_Char_Size(face, 0, floatTof266(ppem), 0, 0);
+        error = FT_Set_Char_Size(face, floatTof266(xppem), floatTof266(yppem), 0, 0);
         if (error) WARNING("FT_Set_Char_Size failed.");
     } else {
         int j = 0;
@@ -190 +192 @@
 //    fprintf(stderr, "font height: %lf\n", (double)(face->bbox.yMax-face->bbox.yMin)/(double)face->units_per_EM*ppem);
 //    fprintf(stderr, "font width: %lf\n", (double)(face->bbox.xMax-face->bbox.xMin)/(double)face->units_per_EM*ppem);
 
-    ymax = (double)(face->bbox.yMax)/(double)face->units_per_EM*ppem+1;
-    ymin = (double)(face->bbox.yMin)/(double)face->units_per_EM*ppem-1;
+    ymax = (double)(face->bbox.yMax)/(double)face->units_per_EM*yppem+1;
+    ymin = (double)(face->bbox.yMin)/(double)face->units_per_EM*yppem-1;
     
-    width = ppem*(face->bbox.xMax-face->bbox.xMin)/face->units_per_EM+3+2*padding;
+    width = xppem*(face->bbox.xMax-face->bbox.xMin)/face->units_per_EM+3+2*padding;
     if (desc->max_width < width) desc->max_width = width;
     width = ALIGN(width);
     desc->pic_b[pic_idx]->charwidth = width;