X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fvideo_content.cc;h=3f6e171a549d2f6feefaca6deb3e3c5556805b66;hb=19dc3455d7112427e0470e58133d25bcb031e9f1;hp=c1f4d0089d8fab807b74d1fae14c8125ac6426f0;hpb=c2b6ca1193107581b433d294aa2327a936f77383;p=dcpomatic.git

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index c1f4d0089..3f6e171a5 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -23,17 +23,22 @@
 #include "video_examiner.h"
 #include "ratio.h"
 #include "compose.hpp"
+#include "config.h"
+#include "colour_conversion.h"
 
 #include "i18n.h"
 
-int const VideoContentProperty::VIDEO_SIZE	 = 0;
-int const VideoContentProperty::VIDEO_FRAME_RATE = 1;
-int const VideoContentProperty::VIDEO_CROP	 = 2;
-int const VideoContentProperty::VIDEO_RATIO	 = 3;
+int const VideoContentProperty::VIDEO_SIZE	  = 0;
+int const VideoContentProperty::VIDEO_FRAME_RATE  = 1;
+int const VideoContentProperty::VIDEO_FRAME_TYPE  = 2;
+int const VideoContentProperty::VIDEO_CROP	  = 3;
+int const VideoContentProperty::VIDEO_RATIO	  = 4;
+int const VideoContentProperty::COLOUR_CONVERSION = 5;
 
 using std::string;
 using std::stringstream;
 using std::setprecision;
+using std::cout;
 using boost::shared_ptr;
 using boost::lexical_cast;
 using boost::optional;
@@ -42,7 +47,9 @@ VideoContent::VideoContent (shared_ptr<const Film> f, Time s, VideoContent::Fram
 	: Content (f, s)
 	, _video_length (len)
 	, _video_frame_rate (0)
+	, _video_frame_type (VIDEO_FRAME_TYPE_2D)
 	, _ratio (Ratio::from_id ("185"))
+	, _colour_conversion (Config::instance()->colour_conversions().front().conversion)
 {
 
 }
@@ -51,7 +58,9 @@ VideoContent::VideoContent (shared_ptr<const Film> f, boost::filesystem::path p)
 	: Content (f, p)
 	, _video_length (0)
 	, _video_frame_rate (0)
+	, _video_frame_type (VIDEO_FRAME_TYPE_2D)
 	, _ratio (Ratio::from_id ("185"))
+	, _colour_conversion (Config::instance()->colour_conversions().front().conversion)
 {
 
 }
@@ -63,6 +72,7 @@ VideoContent::VideoContent (shared_ptr<const Film> f, shared_ptr<const cxml::Nod
 	_video_size.width = node->number_child<int> ("VideoWidth");
 	_video_size.height = node->number_child<int> ("VideoHeight");
 	_video_frame_rate = node->number_child<float> ("VideoFrameRate");
+	_video_frame_type = static_cast<VideoFrameType> (node->number_child<int> ("VideoFrameType"));
 	_crop.left = node->number_child<int> ("LeftCrop");
 	_crop.right = node->number_child<int> ("RightCrop");
 	_crop.top = node->number_child<int> ("TopCrop");
@@ -71,16 +81,7 @@ VideoContent::VideoContent (shared_ptr<const Film> f, shared_ptr<const cxml::Nod
 	if (r) {
 		_ratio = Ratio::from_id (r.get ());
 	}
-}
-
-VideoContent::VideoContent (VideoContent const & o)
-	: Content (o)
-	, _video_length (o._video_length)
-	, _video_size (o._video_size)
-	, _video_frame_rate (o._video_frame_rate)
-	, _ratio (o._ratio)
-{
-
+	_colour_conversion = ColourConversion (node->node_child ("ColourConversion"));
 }
 
 void
@@ -91,6 +92,7 @@ VideoContent::as_xml (xmlpp::Node* node) const
 	node->add_child("VideoWidth")->add_child_text (lexical_cast<string> (_video_size.width));
 	node->add_child("VideoHeight")->add_child_text (lexical_cast<string> (_video_size.height));
 	node->add_child("VideoFrameRate")->add_child_text (lexical_cast<string> (_video_frame_rate));
+	node->add_child("VideoFrameType")->add_child_text (lexical_cast<string> (static_cast<int> (_video_frame_type)));
 	node->add_child("LeftCrop")->add_child_text (boost::lexical_cast<string> (_crop.left));
 	node->add_child("RightCrop")->add_child_text (boost::lexical_cast<string> (_crop.right));
 	node->add_child("TopCrop")->add_child_text (boost::lexical_cast<string> (_crop.top));
@@ -98,6 +100,7 @@ VideoContent::as_xml (xmlpp::Node* node) const
 	if (_ratio) {
 		node->add_child("Ratio")->add_child_text (_ratio->id ());
 	}
+	_colour_conversion.as_xml (node->add_child("ColourConversion"));
 }
 
 void
@@ -107,14 +110,14 @@ VideoContent::take_from_video_examiner (shared_ptr<VideoExaminer> d)
 	libdcp::Size const vs = d->video_size ();
 	float const vfr = d->video_frame_rate ();
 	
-        {
-                boost::mutex::scoped_lock lm (_mutex);
-                _video_size = vs;
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_video_size = vs;
 		_video_frame_rate = vfr;
-        }
-        
-        signal_changed (VideoContentProperty::VIDEO_SIZE);
-        signal_changed (VideoContentProperty::VIDEO_FRAME_RATE);
+	}
+	
+	signal_changed (VideoContentProperty::VIDEO_SIZE);
+	signal_changed (VideoContentProperty::VIDEO_FRAME_RATE);
 }
 
 
@@ -137,16 +140,6 @@ VideoContent::information () const
 	return s.str ();
 }
 
-void
-VideoContent::set_crop (Crop c)
-{
-	{
-		boost::mutex::scoped_lock lm (_mutex);
-		_crop = c;
-	}
-	signal_changed (VideoContentProperty::VIDEO_CROP);
-}
-
 void
 VideoContent::set_left_crop (int c)
 {
@@ -232,7 +225,8 @@ VideoContent::identifier () const
 	  << "_" << crop().left
 	  << "_" << crop().right
 	  << "_" << crop().top
-	  << "_" << crop().bottom;
+	  << "_" << crop().bottom
+	  << "_" << colour_conversion().identifier ();
 
 	if (ratio()) {
 		s << "_" << ratio()->id ();
@@ -240,3 +234,45 @@ VideoContent::identifier () const
 
 	return s.str ();
 }
+
+void
+VideoContent::set_video_frame_type (VideoFrameType t)
+{
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_video_frame_type = t;
+	}
+
+	signal_changed (VideoContentProperty::VIDEO_FRAME_TYPE);
+}
+
+string
+VideoContent::technical_summary () const
+{
+	return String::compose ("video: length %1, size %2x%3, rate %4", video_length(), video_size().width, video_size().height, video_frame_rate());
+}
+
+libdcp::Size
+VideoContent::video_size_after_3d_split () const
+{
+	libdcp::Size const s = video_size ();
+	switch (video_frame_type ()) {
+	case VIDEO_FRAME_TYPE_2D:
+		return s;
+	case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT:
+		return libdcp::Size (s.width / 2, s.height);
+	}
+
+	assert (false);
+}
+
+void
+VideoContent::set_colour_conversion (ColourConversion c)
+{
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_colour_conversion = c;
+	}
+
+	signal_changed (VideoContentProperty::COLOUR_CONVERSION);
+}