X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fplayer_video.cc;h=e36eb1984438add8e0ca4ac98f4d4daf7276b1dd;hp=8c1b95bba37917422d0b89a0ad04c84673ccd48f;hb=HEAD;hpb=b057363e69b77119137c0c8b07402828096e03aa

diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index 8c1b95bba..35c5d3daa 100644
--- a/src/lib/player_video.cc
+++ b/src/lib/player_video.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,13 +18,15 @@
 
 */
 
-#include "player_video.h"
+
 #include "content.h"
-#include "video_content.h"
+#include "film.h"
 #include "image.h"
 #include "image_proxy.h"
 #include "j2k_image_proxy.h"
-#include "film.h"
+#include "player.h"
+#include "player_video.h"
+#include "video_content.h"
 #include <dcp/raw_convert.h>
 extern "C" {
 #include <libavutil/pixfmt.h>
@@ -32,17 +34,19 @@ extern "C" {
 #include <libxml++/libxml++.h>
 #include <iostream>
 
-using std::string;
+
 using std::cout;
-using std::pair;
-using boost::shared_ptr;
-using boost::weak_ptr;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
+using std::function;
+using std::make_shared;
+using std::shared_ptr;
+using std::string;
+using std::weak_ptr;
 using boost::optional;
-using boost::function;
 using dcp::Data;
 using dcp::raw_convert;
 
+
 PlayerVideo::PlayerVideo (
 	shared_ptr<const ImageProxy> in,
 	Crop crop,
@@ -73,6 +77,7 @@ PlayerVideo::PlayerVideo (
 
 }
 
+
 PlayerVideo::PlayerVideo (shared_ptr<cxml::Node> node, shared_ptr<Socket> socket)
 {
 	_crop = Crop (node);
@@ -80,76 +85,85 @@ PlayerVideo::PlayerVideo (shared_ptr<cxml::Node> node, shared_ptr<Socket> socket
 
 	_inter_size = dcp::Size (node->number_child<int> ("InterWidth"), node->number_child<int> ("InterHeight"));
 	_out_size = dcp::Size (node->number_child<int> ("OutWidth"), node->number_child<int> ("OutHeight"));
-	_eyes = (Eyes) node->number_child<int> ("Eyes");
-	_part = (Part) node->number_child<int> ("Part");
-	_video_range = (VideoRange) node->number_child<int>("VideoRange");
+	_eyes = static_cast<Eyes>(node->number_child<int>("Eyes"));
+	_part = static_cast<Part>(node->number_child<int>("Part"));
+	_video_range = static_cast<VideoRange>(node->number_child<int>("VideoRange"));
 	_error = node->optional_bool_child("Error").get_value_or (false);
 
 	/* Assume that the ColourConversion uses the current state version */
 	_colour_conversion = ColourConversion::from_xml (node, Film::current_state_version);
 
-	_in = image_proxy_factory (node->node_child ("In"), socket);
+	_in = image_proxy_factory (node->node_child("In"), socket);
 
-	if (node->optional_number_child<int> ("SubtitleX")) {
+	if (node->optional_number_child<int>("SubtitleX")) {
 
-		shared_ptr<Image> image (
-			new Image (AV_PIX_FMT_BGRA, dcp::Size (node->number_child<int> ("SubtitleWidth"), node->number_child<int> ("SubtitleHeight")), true)
+		auto image = make_shared<Image> (
+			AV_PIX_FMT_BGRA, dcp::Size(node->number_child<int>("SubtitleWidth"), node->number_child<int>("SubtitleHeight")), Image::Alignment::PADDED
 			);
 
 		image->read_from_socket (socket);
 
-		_text = PositionImage (image, Position<int> (node->number_child<int> ("SubtitleX"), node->number_child<int> ("SubtitleY")));
+		_text = PositionImage (image, Position<int>(node->number_child<int>("SubtitleX"), node->number_child<int>("SubtitleY")));
 	}
 }
 
+
 void
 PlayerVideo::set_text (PositionImage image)
 {
 	_text = 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;
 
-	ImageProxy::Result prox = _in->image (_inter_size);
+	auto prox = _in->image (Image::Alignment::PADDED, _inter_size);
 	_error = prox.error;
 
-	Crop total_crop = _crop;
+	auto total_crop = _crop;
 	switch (_part) {
-	case PART_LEFT_HALF:
+	case Part::LEFT_HALF:
 		total_crop.right += prox.image->size().width / 2;
 		break;
-	case PART_RIGHT_HALF:
+	case Part::RIGHT_HALF:
 		total_crop.left += prox.image->size().width / 2;
 		break;
-	case PART_TOP_HALF:
+	case Part::TOP_HALF:
 		total_crop.bottom += prox.image->size().height / 2;
 		break;
-	case PART_BOTTOM_HALF:
+	case Part::BOTTOM_HALF:
 		total_crop.top += prox.image->size().height / 2;
 		break;
 	default:
@@ -165,17 +179,17 @@ PlayerVideo::make_image (function<AVPixelFormat (AVPixelFormat)> pixel_format, V
 		total_crop.bottom /= r;
 	}
 
-	dcp::YUVToRGB yuv_to_rgb = dcp::YUV_TO_RGB_REC601;
+	dcp::YUVToRGB yuv_to_rgb = dcp::YUVToRGB::REC601;
 	if (_colour_conversion) {
 		yuv_to_rgb = _colour_conversion.get().yuv_to_rgb();
 	}
 
 	_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) {
@@ -183,6 +197,7 @@ PlayerVideo::make_image (function<AVPixelFormat (AVPixelFormat)> pixel_format, V
 	}
 }
 
+
 void
 PlayerVideo::add_metadata (xmlpp::Node* node) const
 {
@@ -210,6 +225,7 @@ PlayerVideo::add_metadata (xmlpp::Node* node) const
 	}
 }
 
+
 void
 PlayerVideo::write_to_socket (shared_ptr<Socket> socket) const
 {
@@ -219,33 +235,37 @@ PlayerVideo::write_to_socket (shared_ptr<Socket> socket) const
 	}
 }
 
+
 bool
 PlayerVideo::has_j2k () const
 {
 	/* XXX: maybe other things */
 
-	shared_ptr<const J2KImageProxy> j2k = dynamic_pointer_cast<const J2KImageProxy> (_in);
+	auto j2k = dynamic_pointer_cast<const J2KImageProxy> (_in);
 	if (!j2k) {
 		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>
 PlayerVideo::j2k () const
 {
-	shared_ptr<const J2KImageProxy> j2k = dynamic_pointer_cast<const J2KImageProxy> (_in);
+	auto j2k = dynamic_pointer_cast<const J2KImageProxy> (_in);
 	DCPOMATIC_ASSERT (j2k);
 	return j2k->j2k ();
 }
 
+
 Position<int>
 PlayerVideo::inter_position () const
 {
 	return Position<int> ((_out_size.width - _inter_size.width) / 2, (_out_size.height - _inter_size.height) / 2);
 }
 
+
 /** @return true if this PlayerVideo is definitely the same as another, false if it is probably not */
 bool
 PlayerVideo::same (shared_ptr<const PlayerVideo> other) const
@@ -276,8 +296,9 @@ PlayerVideo::same (shared_ptr<const PlayerVideo> other) const
 	return _in->same (other->_in);
 }
 
+
 AVPixelFormat
-PlayerVideo::force (AVPixelFormat, AVPixelFormat force_to)
+PlayerVideo::force (AVPixelFormat force_to)
 {
 	return force_to;
 }
@@ -288,59 +309,71 @@ PlayerVideo::keep_xyz_or_rgb (AVPixelFormat p)
 	return p == AV_PIX_FMT_XYZ12LE ? AV_PIX_FMT_XYZ12LE : AV_PIX_FMT_RGB48LE;
 }
 
+
 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);
 	}
 }
 
+
 size_t
 PlayerVideo::memory_used () const
 {
 	return _in->memory_used();
 }
 
+
 /** @return Shallow copy of this; _in and _text are shared between the original and the copy */
 shared_ptr<PlayerVideo>
 PlayerVideo::shallow_copy () const
 {
-	return shared_ptr<PlayerVideo>(
-		new PlayerVideo(
-			_in,
-			_crop,
-			_fade,
-			_inter_size,
-			_out_size,
-			_eyes,
-			_part,
-			_colour_conversion,
-			_video_range,
-			_content,
-			_video_frame,
-			_error
-			)
+	return std::make_shared<PlayerVideo>(
+		_in,
+		_crop,
+		_fade,
+		_inter_size,
+		_out_size,
+		_eyes,
+		_part,
+		_colour_conversion,
+		_video_range,
+		_content,
+		_video_frame,
+		_error
 		);
 }
 
+
 /** Re-read crop, fade, inter/out size, colour conversion and video range from our content.
  *  @return true if this was possible, false if not.
  */
 bool
-PlayerVideo::reset_metadata (shared_ptr<const Film> film, dcp::Size video_container_size, dcp::Size film_frame_size)
+PlayerVideo::reset_metadata (shared_ptr<const Film> film, dcp::Size player_video_container_size)
 {
-	shared_ptr<Content> content = _content.lock();
+	auto content = _content.lock();
 	if (!content || !_video_frame) {
 		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), video_container_size, film_frame_size);
-	_out_size = video_container_size;
+	auto const size = content->video->scaled_size(film->frame_size());
+	if (!size) {
+		return false;
+	}
+
+	_inter_size = scale_for_display(
+		*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();