X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer_video.cc;h=02c85be12ea34c0cecc6526e0c8e4766de4d68ca;hb=4fe1a062eb31d680b8b4ac0191b9e2fc2d6aaec3;hp=a86ff14516c941a745914705b473ee26bdd6db61;hpb=73654117144c6de0ec4efe39ddc88485df546cc9;p=dcpomatic.git

diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index a86ff1451..02c85be12 100644
--- a/src/lib/player_video.cc
+++ b/src/lib/player_video.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -19,6 +19,8 @@
 */
 
 #include "player_video.h"
+#include "content.h"
+#include "video_content.h"
 #include "image.h"
 #include "image_proxy.h"
 #include "j2k_image_proxy.h"
@@ -32,7 +34,9 @@ extern "C" {
 
 using std::string;
 using std::cout;
+using std::pair;
 using boost::shared_ptr;
+using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
 using boost::function;
@@ -41,17 +45,17 @@ using dcp::raw_convert;
 
 PlayerVideo::PlayerVideo (
 	shared_ptr<const ImageProxy> in,
-	DCPTime time,
 	Crop crop,
 	boost::optional<double> fade,
 	dcp::Size inter_size,
 	dcp::Size out_size,
 	Eyes eyes,
 	Part part,
-	optional<ColourConversion> colour_conversion
+	optional<ColourConversion> colour_conversion,
+	weak_ptr<Content> content,
+	optional<Frame> video_frame
 	)
 	: _in (in)
-	, _time (time)
 	, _crop (crop)
 	, _fade (fade)
 	, _inter_size (inter_size)
@@ -59,13 +63,14 @@ PlayerVideo::PlayerVideo (
 	, _eyes (eyes)
 	, _part (part)
 	, _colour_conversion (colour_conversion)
+	, _content (content)
+	, _video_frame (video_frame)
 {
 
 }
 
 PlayerVideo::PlayerVideo (shared_ptr<cxml::Node> node, shared_ptr<Socket> socket)
 {
-	_time = DCPTime (node->number_child<DCPTime::Type> ("Time"));
 	_crop = Crop (node);
 	_fade = node->optional_number_child<double> ("Fade");
 
@@ -82,19 +87,19 @@ PlayerVideo::PlayerVideo (shared_ptr<cxml::Node> node, shared_ptr<Socket> socket
 	if (node->optional_number_child<int> ("SubtitleX")) {
 
 		shared_ptr<Image> image (
-			new Image (AV_PIX_FMT_RGBA, dcp::Size (node->number_child<int> ("SubtitleWidth"), node->number_child<int> ("SubtitleHeight")), true)
+			new Image (AV_PIX_FMT_BGRA, dcp::Size (node->number_child<int> ("SubtitleWidth"), node->number_child<int> ("SubtitleHeight")), true)
 			);
 
 		image->read_from_socket (socket);
 
-		_subtitle = 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_subtitle (PositionImage image)
+PlayerVideo::set_text (PositionImage image)
 {
-	_subtitle = image;
+	_text = image;
 }
 
 /** Create an image for this frame.
@@ -102,11 +107,15 @@ PlayerVideo::set_subtitle (PositionImage image)
  *  @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.
+ *  @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 (dcp::NoteHandler note, function<AVPixelFormat (AVPixelFormat)> pixel_format, bool aligned, bool fast) const
 {
-	shared_ptr<Image> im = _in->image (optional<dcp::NoteHandler> (note));
+	pair<shared_ptr<Image>, int> prox = _in->image (optional<dcp::NoteHandler> (note), _inter_size);
+	shared_ptr<Image> im = prox.first;
+	int const reduce = prox.second;
 
 	Crop total_crop = _crop;
 	switch (_part) {
@@ -126,6 +135,15 @@ PlayerVideo::image (dcp::NoteHandler note, function<AVPixelFormat (AVPixelFormat
 		break;
 	}
 
+	if (reduce > 0) {
+		/* Scale the crop down to account for the scaling that has already happened in ImageProxy::image */
+		int const r = pow(2, reduce);
+		total_crop.left /= r;
+		total_crop.right /= r;
+		total_crop.top /= r;
+		total_crop.bottom /= r;
+	}
+
 	dcp::YUVToRGB yuv_to_rgb = dcp::YUV_TO_RGB_REC601;
 	if (_colour_conversion) {
 		yuv_to_rgb = _colour_conversion.get().yuv_to_rgb();
@@ -135,8 +153,8 @@ PlayerVideo::image (dcp::NoteHandler note, function<AVPixelFormat (AVPixelFormat
 		total_crop, _inter_size, _out_size, yuv_to_rgb, pixel_format (_in->pixel_format()), aligned, fast
 		);
 
-	if (_subtitle) {
-		out->alpha_blend (_subtitle->image, _subtitle->position);
+	if (_text) {
+		out->alpha_blend (Image::ensure_aligned (_text->image), _text->position);
 	}
 
 	if (_fade) {
@@ -149,7 +167,6 @@ PlayerVideo::image (dcp::NoteHandler note, function<AVPixelFormat (AVPixelFormat
 void
 PlayerVideo::add_metadata (xmlpp::Node* node) const
 {
-	node->add_child("Time")->add_child_text (raw_convert<string> (_time.get ()));
 	_crop.as_xml (node);
 	if (_fade) {
 		node->add_child("Fade")->add_child_text (raw_convert<string> (_fade.get ()));
@@ -159,16 +176,16 @@ PlayerVideo::add_metadata (xmlpp::Node* node) const
 	node->add_child("InterHeight")->add_child_text (raw_convert<string> (_inter_size.height));
 	node->add_child("OutWidth")->add_child_text (raw_convert<string> (_out_size.width));
 	node->add_child("OutHeight")->add_child_text (raw_convert<string> (_out_size.height));
-	node->add_child("Eyes")->add_child_text (raw_convert<string> (_eyes));
-	node->add_child("Part")->add_child_text (raw_convert<string> (_part));
+	node->add_child("Eyes")->add_child_text (raw_convert<string> (static_cast<int> (_eyes)));
+	node->add_child("Part")->add_child_text (raw_convert<string> (static_cast<int> (_part)));
 	if (_colour_conversion) {
 		_colour_conversion.get().as_xml (node);
 	}
-	if (_subtitle) {
-		node->add_child ("SubtitleWidth")->add_child_text (raw_convert<string> (_subtitle->image->size().width));
-		node->add_child ("SubtitleHeight")->add_child_text (raw_convert<string> (_subtitle->image->size().height));
-		node->add_child ("SubtitleX")->add_child_text (raw_convert<string> (_subtitle->position.x));
-		node->add_child ("SubtitleY")->add_child_text (raw_convert<string> (_subtitle->position.y));
+	if (_text) {
+		node->add_child ("SubtitleWidth")->add_child_text (raw_convert<string> (_text->image->size().width));
+		node->add_child ("SubtitleHeight")->add_child_text (raw_convert<string> (_text->image->size().height));
+		node->add_child ("SubtitleX")->add_child_text (raw_convert<string> (_text->position.x));
+		node->add_child ("SubtitleY")->add_child_text (raw_convert<string> (_text->position.y));
 	}
 }
 
@@ -176,8 +193,8 @@ void
 PlayerVideo::send_binary (shared_ptr<Socket> socket) const
 {
 	_in->send_binary (socket);
-	if (_subtitle) {
-		_subtitle->image->write_to_socket (socket);
+	if (_text) {
+		_text->image->write_to_socket (socket);
 	}
 }
 
@@ -191,7 +208,7 @@ PlayerVideo::has_j2k () const
 		return false;
 	}
 
-	return _crop == Crop () && _inter_size == j2k->size() && !_subtitle && !_fade && !_colour_conversion;
+	return _crop == Crop () && _out_size == j2k->size() && !_text && !_fade && !_colour_conversion;
 }
 
 Data
@@ -208,9 +225,7 @@ 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
- * (apart from _time), false if it is probably not
- */
+/** @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
 {
@@ -224,13 +239,13 @@ PlayerVideo::same (shared_ptr<const PlayerVideo> other) const
 		return false;
 	}
 
-	if ((!_subtitle && other->_subtitle) || (_subtitle && !other->_subtitle)) {
-		/* One has a subtitle and the other doesn't */
+	if ((!_text && other->_text) || (_text && !other->_text)) {
+		/* One has a text and the other doesn't */
 		return false;
 	}
 
-	if (_subtitle && other->_subtitle && !_subtitle->same (other->_subtitle.get ())) {
-		/* They both have subtitles but they are different */
+	if (_text && other->_text && !_text->same (other->_text.get ())) {
+		/* They both have texts but they are different */
 		return false;
 	}
 
@@ -250,3 +265,55 @@ PlayerVideo::keep_xyz_or_rgb (AVPixelFormat p)
 {
 	return p == AV_PIX_FMT_XYZ12LE ? AV_PIX_FMT_XYZ12LE : AV_PIX_FMT_RGB48LE;
 }
+
+void
+PlayerVideo::prepare ()
+{
+	_in->prepare (_inter_size);
+}
+
+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,
+			_content,
+			_video_frame
+			)
+		);
+}
+
+/** Re-read crop, fade, inter/out size and colour conversion from our content.
+ *  @return true if this was possible, false if not.
+ */
+bool
+PlayerVideo::reset_metadata (dcp::Size video_container_size, dcp::Size film_frame_size)
+{
+	shared_ptr<Content> content = _content.lock();
+	if (!content || !_video_frame) {
+		return false;
+	}
+
+	_crop = content->video->crop();
+	_fade = content->video->fade(_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();
+
+	return true;
+}