diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-03-04 16:44:20 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-03-04 16:44:20 +0000 |
| commit | 3753cb8685e1755b067676345a5871db24149d0f (patch) | |
| tree | 96dbcc8bd10583fcb1ee23823855b0e8ea7aa0fd /src/lib/player.cc | |
| parent | f0738a22fc7555c306d49bcd1c356ce210e2c0e2 (diff) | |
Add support for no-scale of the input video.
Requested-by: Gérald Maruccia
Diffstat (limited to 'src/lib/player.cc')
| -rw-r--r-- | src/lib/player.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc index 59db923be..99aece8d6 100644 --- 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 (); - 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 ( @@ -537,7 +536,7 @@ Player::content_changed (weak_ptr<Content> w, int property, bool frequent) 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 ) { |