projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bb285de
)
Try to fix no-stretch / no-scale for non-square pixels (#1636).
v2.15.30
author
Carl Hetherington
<cth@carlh.net>
Fri, 8 Nov 2019 16:21:19 +0000
(17:21 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Fri, 8 Nov 2019 16:21:19 +0000
(17:21 +0100)
src/lib/video_content_scale.cc
patch
|
blob
|
history
diff --git
a/src/lib/video_content_scale.cc
b/src/lib/video_content_scale.cc
index 137d78ad2ff7a9a2629c009bb278c495f60a8d3c..73dfd27fef38d9ef4ea5a9cbf707952e0dfee4f7 100644
(file)
--- 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.
/** @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
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;
dcp::Size size;