diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-11-08 23:55:34 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-11-08 23:55:34 +0100 |
| commit | 81fa6ec113fdcfce04aa4a2972cdef19ee038155 (patch) | |
| tree | 80ba6d96423459871e7d56f2912a626a577ee395 /src/lib/video_content_scale.cc | |
| parent | 7e355e7f3518eddbf544f299e9e4ab9c9cf482ac (diff) | |
| parent | ee0f2219f3799881bc9f5060edd2ceeecff4217d (diff) | |
Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.xv2.15.31
Diffstat (limited to 'src/lib/video_content_scale.cc')
| -rw-r--r-- | src/lib/video_content_scale.cc | 4 |
1 files changed, 3 insertions, 1 deletions
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<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; |