X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer_video.cc;h=0375fa01bbb726a80b43b53ef6c7d4c714ee2714;hb=9facdf75a2776319fc5826cfa3dd85340f3c8879;hp=b7a8f86693c995606cf47a07791192c5bcb1d92e;hpb=985a83ffbf251db481150221914ef74fbfe549b2;p=dcpomatic.git

diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index b7a8f8669..0375fa01b 100644
--- a/src/lib/player_video.cc
+++ b/src/lib/player_video.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,16 +17,15 @@
 
 */
 
-#include <dcp/raw_convert.h>
 #include "player_video.h"
 #include "image.h"
 #include "image_proxy.h"
 #include "j2k_image_proxy.h"
-#include "scaler.h"
+#include "film.h"
+#include "raw_convert.h"
 
 using std::string;
 using std::cout;
-using dcp::raw_convert;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
@@ -38,7 +37,6 @@ PlayerVideo::PlayerVideo (
 	boost::optional<float> fade,
 	dcp::Size inter_size,
 	dcp::Size out_size,
-	Scaler const * scaler,
 	Eyes eyes,
 	Part part,
 	optional<ColourConversion> colour_conversion
@@ -49,7 +47,6 @@ PlayerVideo::PlayerVideo (
 	, _fade (fade)
 	, _inter_size (inter_size)
 	, _out_size (out_size)
-	, _scaler (scaler)
 	, _eyes (eyes)
 	, _part (part)
 	, _colour_conversion (colour_conversion)
@@ -65,10 +62,11 @@ 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"));
-	_scaler = Scaler::from_id (node->string_child ("Scaler"));
 	_eyes = (Eyes) node->number_child<int> ("Eyes");
 	_part = (Part) node->number_child<int> ("Part");
-	_colour_conversion = ColourConversion::from_xml (node);
+
+	/* 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);
 
@@ -91,9 +89,9 @@ PlayerVideo::set_subtitle (PositionImage image)
 }
 
 shared_ptr<Image>
-PlayerVideo::image (AVPixelFormat pixel_format, bool burn_subtitle) const
+PlayerVideo::image (AVPixelFormat pixel_format, bool burn_subtitle, dcp::NoteHandler note) const
 {
-	shared_ptr<Image> im = _in->image ();
+	shared_ptr<Image> im = _in->image (optional<dcp::NoteHandler> (note));
 	
 	Crop total_crop = _crop;
 	switch (_part) {
@@ -112,8 +110,13 @@ PlayerVideo::image (AVPixelFormat pixel_format, bool burn_subtitle) const
 	default:
 		break;
 	}
+
+	dcp::YUVToRGB yuv_to_rgb = dcp::YUV_TO_RGB_REC601;
+	if (_colour_conversion) {
+		yuv_to_rgb = _colour_conversion.get().yuv_to_rgb();
+	}
 		
-	shared_ptr<Image> out = im->crop_scale_window (total_crop, _inter_size, _out_size, _scaler, pixel_format, true);
+	shared_ptr<Image> out = im->crop_scale_window (total_crop, _inter_size, _out_size, yuv_to_rgb, pixel_format, true);
 
 	if (burn_subtitle && _subtitle.image) {
 		out->alpha_blend (_subtitle.image, _subtitle.position);
@@ -139,7 +142,6 @@ PlayerVideo::add_metadata (xmlpp::Node* node, bool send_subtitles) 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("Scaler")->add_child_text (_scaler->id ());
 	node->add_child("Eyes")->add_child_text (raw_convert<string> (_eyes));
 	node->add_child("Part")->add_child_text (raw_convert<string> (_part));
 	if (_colour_conversion) {
@@ -179,7 +181,7 @@ shared_ptr<EncodedData>
 PlayerVideo::j2k () const
 {
 	shared_ptr<const J2KImageProxy> j2k = dynamic_pointer_cast<const J2KImageProxy> (_in);
-	assert (j2k);
+	DCPOMATIC_ASSERT (j2k);
 	return j2k->j2k ();
 }
 
@@ -195,16 +197,15 @@ PlayerVideo::inter_position () const
 bool
 PlayerVideo::same (shared_ptr<const PlayerVideo> other) const
 {
-	if (_in != other->_in ||
-	    _crop != other->_crop ||
+	if (_crop != other->_crop ||
 	    _fade.get_value_or(0) != other->_fade.get_value_or(0) ||
 	    _inter_size != other->_inter_size ||
 	    _out_size != other->_out_size ||
-	    _scaler != other->_scaler ||
 	    _eyes != other->_eyes ||
 	    _part != other->_part ||
 	    _colour_conversion != other->_colour_conversion ||
 	    !_subtitle.same (other->_subtitle)) {
+
 		return false;
 	}