Don't scale chroma subsampled images to sizes that don't align with the subsampling...

[dcpomatic.git] / src / lib / player_video.cc

diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index 7c36af31b54bbbb7e8c764b9f0b3dcba89145e5e..4cc536bb7530583639e14e3ff7c6270549daf947 100644 (file)
--- a/src/lib/player_video.cc
+++ b/src/lib/player_video.cc
@@ -343,9 +343,14 @@ PlayerVideo::reset_metadata (shared_ptr<const Film> film, dcp::Size player_video
                return false;
        }
 
-       _crop = content->video->crop();
+       _crop = content->video->actual_crop();
        _fade = content->video->fade(film, _video_frame.get());
-       _inter_size = scale_for_display(content->video->scaled_size(film->frame_size()), player_video_container_size, film->frame_size());
+       _inter_size = scale_for_display(
+               content->video->scaled_size(film->frame_size()),
+               player_video_container_size,
+               film->frame_size(),
+               content->video->pixel_quanta()
+               );
        _out_size = player_video_container_size;
        _colour_conversion = content->video->colour_conversion();
        _video_range = content->video->range();