From 4699463e19b2a153d64aeb0e00c62be1157bfc1b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 16 Jun 2013 14:53:35 +0100 Subject: Some work on cropping in the film viewer; also prevent player from always scaling up to DCP resolution. --- src/lib/video_decoder.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/lib/video_decoder.cc') diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc index d1a8fc6e6..58aceb407 100644 --- a/src/lib/video_decoder.cc +++ b/src/lib/video_decoder.cc @@ -56,7 +56,7 @@ VideoDecoder::video (shared_ptr image, bool same, Time t) shared_ptr film = _film.lock (); assert (film); - libdcp::Size const container_size = film->container()->size (film->full_frame ()); + libdcp::Size const container_size = _video_container_size.get_value_or (film->container()->size (film->full_frame ())); libdcp::Size const image_size = _video_content->ratio()->size (container_size); shared_ptr out = image->scale_and_convert_to_rgb (image_size, film->scaler(), true); @@ -144,4 +144,8 @@ VideoDecoder::seek_forward () _next_video += film->video_frames_to_time (1); } - +void +VideoDecoder::set_video_container_size (libdcp::Size s) +{ + _video_container_size = s; +} -- cgit v1.2.3