X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content_scale.cc;h=59ff4bd9b663d5fe0084192102668239ca7fc6b6;hb=f07623551706b849190c84059bac455088f8eb1e;hp=aebafc8e59bedf90390d8bbbe55d92a5dc8993fa;hpb=4dbc6ef917aeceb906b1ef1caf6911033e7e2c54;p=dcpomatic.git

diff --git a/src/lib/video_content_scale.cc b/src/lib/video_content_scale.cc
index aebafc8e5..59ff4bd9b 100644
--- a/src/lib/video_content_scale.cc
+++ b/src/lib/video_content_scale.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -30,6 +30,8 @@
 
 using std::vector;
 using std::string;
+using std::min;
+using std::cout;
 using boost::shared_ptr;
 using boost::optional;
 
@@ -125,26 +127,39 @@ VideoContentScale::from_id (string id)
  *  @param film_container The size of the film's image.
  */
 dcp::Size
-VideoContentScale::size (shared_ptr<const VideoContent> c, dcp::Size display_container, dcp::Size film_container, int round) const
+VideoContentScale::size (shared_ptr<const VideoContent> c, dcp::Size display_container, dcp::Size film_container) const
 {
+	/* Work out the size of the content if it were put inside film_container */
+
+	dcp::Size const video_size_after_crop = c->video_size_after_crop ();
+
+	dcp::Size size;
+
 	if (_ratio) {
-		return fit_ratio_within (_ratio->ratio (), display_container, round);
+		/* Stretch to fit the requested ratio */
+		size = fit_ratio_within (_ratio->ratio (), film_container);
+	} else if (_scale || video_size_after_crop.width > film_container.width || video_size_after_crop.height > film_container.height) {
+		/* Scale, preserving aspect ratio; this is either if we have been asked to scale with no stretch
+		   or if the unscaled content is too big for film_container.
+		*/
+		size = fit_ratio_within (video_size_after_crop.ratio(), film_container);
+	} else {
+		/* No stretch nor scale */
+		size = video_size_after_crop;
 	}
 
-	dcp::Size const ac = c->video_size_after_crop ();
-
-	/* Force scale if the film_container is smaller than the content's image */
-	if (_scale || film_container.width < ac.width || film_container.height < ac.height) {
-		return fit_ratio_within (ac.ratio (), display_container, round);
+	/* Now scale it down if the display container is smaller than the film container */
+	if (display_container != film_container) {
+		float const scale = min (
+			float (display_container.width) / film_container.width,
+			float (display_container.height) / film_container.height
+			);
+		
+		size.width = rint (size.width * scale);
+		size.height = rint (size.height * scale);
 	}
 
-	/* Scale the image so that it will be in the right place in film_container, even if display_container is a
-	   different size.
-	*/
-	return dcp::Size (
-		c->video_size().width  * float(display_container.width)  / film_container.width,
-		c->video_size().height * float(display_container.height) / film_container.height
-		);
+	return size;
 }
 
 void