X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer_video.cc;h=5c287dc92d3cbdf1bd48f66af90be17af41edd3c;hb=0cbdfdd6c0ef9a1b72070ee741be76332491392a;hp=ec8dd16d49f4a5b27ad6e3344853e0b716422f52;hpb=bb911c462ab6e04d399bfc68c2d331b0d4e9ef97;p=dcpomatic.git

diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index ec8dd16d4..5c287dc92 100644
--- a/src/lib/player_video.cc
+++ b/src/lib/player_video.cc
@@ -102,18 +102,33 @@ PlayerVideo::set_text (PositionImage image)
 	_text = image;
 }
 
-/** Create an image for this frame.
- *  @param note Handler for any notes that are made during the process.
+shared_ptr<Image>
+PlayerVideo::image (function<AVPixelFormat (AVPixelFormat)> pixel_format, bool aligned, bool fast) const
+{
+	/* XXX: this assumes that image() and prepare() are only ever called with the same parameters (except crop, inter size, out size) */
+
+	boost::mutex::scoped_lock lm (_mutex);
+	if (!_image || _crop != _image_crop || _inter_size != _image_inter_size || _out_size != _image_out_size) {
+		make_image (pixel_format, aligned, fast);
+	}
+	return _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 always_rgb and keep_xyz_or_rgb are provided for use here.
+ *  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.
  */
-shared_ptr<Image>
-PlayerVideo::image (optional<dcp::NoteHandler> note, function<AVPixelFormat (AVPixelFormat)> pixel_format, bool aligned, bool fast) const
+void
+PlayerVideo::make_image (function<AVPixelFormat (AVPixelFormat)> pixel_format, bool aligned, bool fast) const
 {
-	pair<shared_ptr<Image>, int> prox = _in->image (optional<dcp::NoteHandler> (note), _inter_size);
+	_image_crop = _crop;
+	_image_inter_size = _inter_size;
+	_image_out_size = _out_size;
+
+	pair<shared_ptr<Image>, int> prox = _in->image (_inter_size);
 	shared_ptr<Image> im = prox.first;
 	int const reduce = prox.second;
 
@@ -149,19 +164,17 @@ PlayerVideo::image (optional<dcp::NoteHandler> note, function<AVPixelFormat (AVP
 		yuv_to_rgb = _colour_conversion.get().yuv_to_rgb();
 	}
 
-	shared_ptr<Image> out = im->crop_scale_window (
+	_image = im->crop_scale_window (
 		total_crop, _inter_size, _out_size, yuv_to_rgb, pixel_format (im->pixel_format()), aligned, fast
 		);
 
 	if (_text) {
-		out->alpha_blend (Image::ensure_aligned (_text->image), _text->position);
+		_image->alpha_blend (Image::ensure_aligned (_text->image), _text->position);
 	}
 
 	if (_fade) {
-		out->fade (_fade.get ());
+		_image->fade (_fade.get ());
 	}
-
-	return out;
 }
 
 void
@@ -230,7 +243,7 @@ bool
 PlayerVideo::same (shared_ptr<const PlayerVideo> other) const
 {
 	if (_crop != other->_crop ||
-	    _fade.get_value_or(0) != other->_fade.get_value_or(0) ||
+	    _fade != other->_fade ||
 	    _inter_size != other->_inter_size ||
 	    _out_size != other->_out_size ||
 	    _eyes != other->_eyes ||
@@ -255,9 +268,9 @@ PlayerVideo::same (shared_ptr<const PlayerVideo> other) const
 }
 
 AVPixelFormat
-PlayerVideo::always_rgb (AVPixelFormat)
+PlayerVideo::force (AVPixelFormat, AVPixelFormat force_to)
 {
-	return AV_PIX_FMT_RGB24;
+	return force_to;
 }
 
 AVPixelFormat
@@ -267,9 +280,13 @@ PlayerVideo::keep_xyz_or_rgb (AVPixelFormat p)
 }
 
 void
-PlayerVideo::prepare ()
+PlayerVideo::prepare (function<AVPixelFormat (AVPixelFormat)> pixel_format, bool aligned, bool fast)
 {
 	_in->prepare (_inter_size);
+	boost::mutex::scoped_lock lm (_mutex);
+	if (!_image) {
+		make_image (pixel_format, aligned, fast);
+	}
 }
 
 size_t
@@ -302,7 +319,7 @@ PlayerVideo::shallow_copy () const
  *  @return true if this was possible, false if not.
  */
 bool
-PlayerVideo::reset_metadata (dcp::Size video_container_size, dcp::Size film_frame_size)
+PlayerVideo::reset_metadata (shared_ptr<const Film> film, dcp::Size video_container_size, dcp::Size film_frame_size)
 {
 	shared_ptr<Content> content = _content.lock();
 	if (!content || !_video_frame) {
@@ -310,7 +327,7 @@ PlayerVideo::reset_metadata (dcp::Size video_container_size, dcp::Size film_fram
 	}
 
 	_crop = content->video->crop();
-	_fade = content->video->fade(_video_frame.get());
+	_fade = content->video->fade(film, _video_frame.get());
 	_inter_size = content->video->scale().size(content->video, video_container_size, film_frame_size);
 	_out_size = video_container_size;
 	_colour_conversion = content->video->colour_conversion();