X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fplayer_video.cc;h=4cc536bb7530583639e14e3ff7c6270549daf947;hb=c85f253637e6aecfd7ce7bd53c68a2a73ca49d7b;hp=e473b8750474a975f53c3fdf6f1521ec2407e1b8;hpb=8963f0007af1a312017b9627c18b82ec2a577591;p=dcpomatic.git

diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index e473b8750..4cc536bb7 100644
--- a/src/lib/player_video.cc
+++ b/src/lib/player_video.cc
@@ -36,7 +36,6 @@ extern "C" {
 using std::cout;
 using std::dynamic_pointer_cast;
 using std::make_shared;
-using std::pair;
 using std::shared_ptr;
 using std::string;
 using std::weak_ptr;
@@ -95,7 +94,7 @@ PlayerVideo::PlayerVideo (shared_ptr<cxml::Node> node, shared_ptr<Socket> socket
 	if (node->optional_number_child<int>("SubtitleX")) {
 
 		auto image = make_shared<Image> (
-			AV_PIX_FMT_BGRA, dcp::Size(node->number_child<int>("SubtitleWidth"), node->number_child<int>("SubtitleHeight")), true
+			AV_PIX_FMT_BGRA, dcp::Size(node->number_child<int>("SubtitleWidth"), node->number_child<int>("SubtitleHeight")), Image::Alignment::PADDED
 			);
 
 		image->read_from_socket (socket);
@@ -111,33 +110,40 @@ PlayerVideo::set_text (PositionImage image)
 }
 
 shared_ptr<Image>
-PlayerVideo::image (function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, bool aligned, bool fast) const
+PlayerVideo::image (function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, bool fast) const
 {
 	/* XXX: this assumes that image() and prepare() are only ever called with the same parameters (except crop, inter size, out size, fade) */
 
 	boost::mutex::scoped_lock lm (_mutex);
 	if (!_image || _crop != _image_crop || _inter_size != _image_inter_size || _out_size != _image_out_size || _fade != _image_fade) {
-		make_image (pixel_format, video_range, aligned, fast);
+		make_image (pixel_format, video_range, fast);
 	}
 	return _image;
 }
 
+
+shared_ptr<const Image>
+PlayerVideo::raw_image () const
+{
+	return _in->image(Image::Alignment::COMPACT, _inter_size).image;
+}
+
+
 /** Create an image for this frame.  A lock must be held on _mutex.
  *  @param pixel_format Function which is called to decide what pixel format the output image should be;
  *  it is passed the pixel format of the input image from the ImageProxy, and should return the desired
  *  output pixel format.  Two functions force and keep_xyz_or_rgb are provided for use here.
- *  @param aligned true if the output image should be aligned to 32-byte boundaries.
  *  @param fast true to be fast at the expense of quality.
  */
 void
-PlayerVideo::make_image (function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, bool aligned, bool fast) const
+PlayerVideo::make_image (function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, bool fast) const
 {
 	_image_crop = _crop;
 	_image_inter_size = _inter_size;
 	_image_out_size = _out_size;
 	_image_fade = _fade;
 
-	auto prox = _in->image (_inter_size);
+	auto prox = _in->image (Image::Alignment::PADDED, _inter_size);
 	_error = prox.error;
 
 	auto total_crop = _crop;
@@ -173,11 +179,11 @@ PlayerVideo::make_image (function<AVPixelFormat (AVPixelFormat)> pixel_format, V
 	}
 
 	_image = prox.image->crop_scale_window (
-		total_crop, _inter_size, _out_size, yuv_to_rgb, _video_range, pixel_format (prox.image->pixel_format()), video_range, aligned, fast
+		total_crop, _inter_size, _out_size, yuv_to_rgb, _video_range, pixel_format (prox.image->pixel_format()), video_range, Image::Alignment::COMPACT, fast
 		);
 
 	if (_text) {
-		_image->alpha_blend (Image::ensure_aligned (_text->image), _text->position);
+		_image->alpha_blend (_text->image, _text->position);
 	}
 
 	if (_fade) {
@@ -231,7 +237,7 @@ PlayerVideo::has_j2k () const
 		return false;
 	}
 
-	return _crop == Crop() && _out_size == j2k->size() && !_text && !_fade && !_colour_conversion;
+	return _crop == Crop() && _out_size == j2k->size() && _inter_size == j2k->size() && !_text && !_fade && !_colour_conversion;
 }
 
 shared_ptr<const dcp::Data>
@@ -291,12 +297,12 @@ PlayerVideo::keep_xyz_or_rgb (AVPixelFormat p)
 }
 
 void
-PlayerVideo::prepare (function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, bool aligned, bool fast)
+PlayerVideo::prepare (function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, Image::Alignment alignment, bool fast, bool proxy_only)
 {
-	_in->prepare (_inter_size);
+	_in->prepare (alignment, _inter_size);
 	boost::mutex::scoped_lock lm (_mutex);
-	if (!_image) {
-		make_image (pixel_format, video_range, aligned, fast);
+	if (!_image && !proxy_only) {
+		make_image (pixel_format, video_range, fast);
 	}
 }
 
@@ -337,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();