From ee0f2219f3799881bc9f5060edd2ceeecff4217d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 8 Nov 2019 17:21:19 +0100 Subject: [PATCH] Try to fix no-stretch / no-scale for non-square pixels (#1636). --- src/lib/video_content_scale.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/video_content_scale.cc b/src/lib/video_content_scale.cc index 137d78ad2..73dfd27fe 100644 --- a/src/lib/video_content_scale.cc +++ b/src/lib/video_content_scale.cc @@ -107,13 +107,15 @@ VideoContentScale::name () const /** @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 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; -- 2.30.2