X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content_scale.cc;h=73dfd27fef38d9ef4ea5a9cbf707952e0dfee4f7;hb=001ba1644fc6aa54f91fcaaa62ae7e5de2313bc1;hp=c86ba6ef8a9995cdc8bf7f5c23e1958f5a3a16b3;hpb=b1dc9c3a2f7e55c9afc5bf2d5b465371b048e14f;p=dcpomatic.git

diff --git a/src/lib/video_content_scale.cc b/src/lib/video_content_scale.cc
index c86ba6ef8..73dfd27fe 100644
--- a/src/lib/video_content_scale.cc
+++ b/src/lib/video_content_scale.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -95,7 +95,7 @@ string
 VideoContentScale::name () const
 {
 	if (_ratio) {
-		return _ratio->nickname ();
+		return _ratio->image_nickname ();
 	}
 
 	if (_scale) {
@@ -105,30 +105,17 @@ VideoContentScale::name () const
 	return _("No scale");
 }
 
-VideoContentScale
-VideoContentScale::from_id (string id)
-{
-	Ratio const * r = Ratio::from_id (id);
-	if (r) {
-		return VideoContentScale (r);
-	}
-
-	if (id == "S0") {
-		return VideoContentScale (false);
-	}
-
-	return VideoContentScale (true);
-}
-
 /** @param display_container Size of the container that we are displaying this content in.
  *  @param film_container The size of the film's image.
+ *  @return Size, in pixels that the VideoContent's image should be scaled to (taking into account its pixel aspect ratio)
  */
 dcp::Size
 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->size_after_crop ();
+	dcp::Size video_size_after_crop = c->size_after_crop();
+	video_size_after_crop.width *= c->sample_aspect_ratio().get_value_or(1);
 
 	dcp::Size size;