From a8824f12ddfe66585db43fb0f92d7c90b5bbd19d Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Tue, 23 Oct 2012 21:23:53 +0200
Subject: options: remove --subfont-autoscale (changes default font scale)

The code for this option attempted to emulate the old as-documented
behavior. It wasn't very good at it, and now that the old OSD code has
been removed, it's entirely pointless.

This removes the factor 1.7 with which --subfont-text-scale was
multiplied.
---
 sub/ass_mp.c     | 11 -----------
 sub/osd_libass.c | 14 +-------------
 sub/sub.c        |  7 +------
 sub/sub.h        |  1 -
 4 files changed, 2 insertions(+), 31 deletions(-)

(limited to 'sub')

diff --git a/sub/ass_mp.c b/sub/ass_mp.c
index c4c418d5ba..1867880f38 100644
--- a/sub/ass_mp.c
+++ b/sub/ass_mp.c
@@ -61,17 +61,6 @@ ASS_Track *mp_ass_default_track(ASS_Library *library, struct MPOpts *opts)
         style->treat_fontname_as_pattern = 1;
 
         double fs = track->PlayResY * text_font_scale_factor / 100.;
-        /* The font size is always proportional to video height only;
-         * real -subfont-autoscale behavior is not implemented.
-         * Apply a correction that corresponds to about 4:3 aspect ratio
-         * video to get a size somewhat closer to what non-libass rendering
-         * would produce with the same text_font_scale_factor
-         * and subtitle_autoscale.
-         */
-        if (subtitle_autoscale == 2)
-            fs *= 1.3;
-        else if (subtitle_autoscale == 3)
-            fs *= 1.7;
 
         uint32_t c1 = 0xFFFFFF00;
         uint32_t c2 = 0x00000000;
diff --git a/sub/osd_libass.c b/sub/osd_libass.c
index 4a6a0c88cb..5f17f2fa6f 100644
--- a/sub/osd_libass.c
+++ b/sub/osd_libass.c
@@ -65,19 +65,7 @@ static void update_font_style(ASS_Track *track, ASS_Style *style, double factor)
     style->Encoding = -1;
 
     // duplicated from ass_mp.c
-    double fs = track->PlayResY * factor / 100.;
-    /* The font size is always proportional to video height only;
-    * real -subfont-autoscale behavior is not implemented.
-    * Apply a correction that corresponds to about 4:3 aspect ratio
-    * video to get a size somewhat closer to what non-libass rendering
-    * would produce with the same text_font_scale_factor
-    * and subtitle_autoscale.
-    */
-    if (subtitle_autoscale == 2)
-        fs *= 1.3;
-    else if (subtitle_autoscale == 3)
-        fs *= 1.7;
-    style->FontSize = fs;
+    style->FontSize = track->PlayResY * factor / 100.;
     style->Outline = style->FontSize / 16;
 }
 
diff --git a/sub/sub.c b/sub/sub.c
index 04fbcd877c..bba53c926f 100644
--- a/sub/sub.c
+++ b/sub/sub.c
@@ -64,12 +64,7 @@ int sub_pos=100;
 int sub_visibility=1;
 
 subtitle* vo_sub=NULL;
-float text_font_scale_factor = 3.5;
-// 0 = no autoscale
-// 1 = video height
-// 2 = video width
-// 3 = diagonal
-int subtitle_autoscale = 3;
+float text_font_scale_factor = 6;
 
 char *font_name = NULL;
 char *sub_font_name = NULL;
diff --git a/sub/sub.h b/sub/sub.h
index 2c54bfb56b..70adadcc70 100644
--- a/sub/sub.h
+++ b/sub/sub.h
@@ -182,7 +182,6 @@ extern char *sub_cp;
 extern int sub_pos;
 
 extern float text_font_scale_factor;
-extern int subtitle_autoscale;
 
 extern char *font_name;
 extern char *sub_font_name;
-- 
cgit v1.2.3