Fix scaling of subtitles to be more correct when stretching the fonts.

1 files changed, 11 insertions, 2 deletions

diff --git a/src/lib/player.cc b/src/lib/player.cc
index fc1332573..3e92eb3d9 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -670,8 +670,17 @@ Player::get_subtitles (DCPTime time, DCPTime length, bool starting, bool burnt,
 				s.set_v_position (s.v_position() + subtitle_content->subtitle_y_offset ());
 				float const xs = subtitle_content->subtitle_x_scale();
 				float const ys = subtitle_content->subtitle_y_scale();
-				float const average = s.size() * (xs + ys) / 2;
-				s.set_size (average);
+				float size = s.size();
+
+				/* Adjust size to express the common part of the scaling;
+				   e.g. if xs = ys = 0.5 we scale size by 2.
+				*/
+				if (xs > 1e-5 && ys > 1e-5) {
+					size *= 1 / min (1 / xs, 1 / ys);
+				}
+				s.set_size (size);
+
+				/* Then express aspect ratio changes */
 				if (fabs (1.0 - xs / ys) > dcp::ASPECT_ADJUST_EPSILON) {
 					s.set_aspect_adjust (xs / ys);
 				}