X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content_scale.cc;h=73dfd27fef38d9ef4ea5a9cbf707952e0dfee4f7;hb=08e3de8ffa64c5e352ee417b5ab6b3b0fc9a4d13;hp=137d78ad2ff7a9a2629c009bb278c495f60a8d3c;hpb=fe64650ae5496c4de73894b97c53e6951ac3548f;p=dcpomatic.git 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;