projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add support for no-scale of the input video.
[dcpomatic.git]
/
src
/
lib
/
player.cc
diff --git
a/src/lib/player.cc
b/src/lib/player.cc
index 59db923be79503d4425122f24c320690e3d961ed..99aece8d660d5c67c1140410868b6bdd32d3b9f5 100644
(file)
--- a/
src/lib/player.cc
+++ b/
src/lib/player.cc
@@
-273,8
+273,7
@@
Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const Image> image
}
Time const time = content->position() + relative_time + extra - content->trim_start ();
}
Time const time = content->position() + relative_time + extra - content->trim_start ();
- float const ratio = content->ratio() ? content->ratio()->ratio() : content->video_size_after_crop().ratio();
- libdcp::Size const image_size = fit_ratio_within (ratio, _video_container_size);
+ libdcp::Size const image_size = content->scale().size (content, _video_container_size);
shared_ptr<PlayerImage> pi (
new PlayerImage (
shared_ptr<PlayerImage> pi (
new PlayerImage (
@@
-537,7
+536,7
@@
Player::content_changed (weak_ptr<Content> w, int property, bool frequent)
Changed (frequent);
} else if (
Changed (frequent);
} else if (
- property == VideoContentProperty::VIDEO_CROP || property == VideoContentProperty::VIDEO_
RATIO
||
+ property == VideoContentProperty::VIDEO_CROP || property == VideoContentProperty::VIDEO_
SCALE
||
property == VideoContentProperty::VIDEO_FRAME_RATE
) {
property == VideoContentProperty::VIDEO_FRAME_RATE
) {