X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=d0eab4dbf93f870344b7c34228ed14d7813ad26d;hb=9e1343fb30df204811e80bfd1387574b9d383a09;hp=d70ece3404dcad3308583ea63e2c2207f9b54493;hpb=38fda7888663429d452b9c71902e8bb5239dd720;p=dcpomatic.git

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index d70ece340..d0eab4dbf 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -19,18 +19,24 @@
 
 #include <iomanip>
 #include <libcxml/cxml.h>
+#include <libdcp/colour_matrix.h>
 #include "video_content.h"
 #include "video_examiner.h"
 #include "ratio.h"
 #include "compose.hpp"
+#include "config.h"
+#include "colour_conversion.h"
+#include "util.h"
+#include "film.h"
 
 #include "i18n.h"
 
-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::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;
@@ -47,7 +53,7 @@ VideoContent::VideoContent (shared_ptr<const Film> f, Time s, VideoContent::Fram
 	, _video_frame_type (VIDEO_FRAME_TYPE_2D)
 	, _ratio (Ratio::from_id ("185"))
 {
-
+	setup_default_colour_conversion ();
 }
 
 VideoContent::VideoContent (shared_ptr<const Film> f, boost::filesystem::path p)
@@ -57,11 +63,12 @@ VideoContent::VideoContent (shared_ptr<const Film> f, boost::filesystem::path p)
 	, _video_frame_type (VIDEO_FRAME_TYPE_2D)
 	, _ratio (Ratio::from_id ("185"))
 {
-
+	setup_default_colour_conversion ();
 }
 
 VideoContent::VideoContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node)
 	: Content (f, node)
+	, _ratio (0)
 {
 	_video_length = node->number_child<VideoContent::Frame> ("VideoLength");
 	_video_size.width = node->number_child<int> ("VideoWidth");
@@ -76,6 +83,7 @@ VideoContent::VideoContent (shared_ptr<const Film> f, shared_ptr<const cxml::Nod
 	if (r) {
 		_ratio = Ratio::from_id (r.get ());
 	}
+	_colour_conversion = ColourConversion (node->node_child ("ColourConversion"));
 }
 
 void
@@ -94,6 +102,13 @@ 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
+VideoContent::setup_default_colour_conversion ()
+{
+	_colour_conversion = PresetColourConversion (_("sRGB"), 2.4, true, libdcp::colour_matrix::srgb_to_xyz, 2.6).conversion;
 }
 
 void
@@ -127,7 +142,7 @@ VideoContent::information () const
 		_("%1x%2 pixels (%3:1)"),
 		video_size().width,
 		video_size().height,
-		setprecision (3), float (video_size().width) / video_size().height
+		setprecision (3), video_size().ratio ()
 		);
 	
 	return s.str ();
@@ -214,11 +229,12 @@ string
 VideoContent::identifier () const
 {
 	stringstream s;
-	s << Content::digest()
+	s << Content::identifier()
 	  << "_" << crop().left
 	  << "_" << crop().right
 	  << "_" << crop().top
-	  << "_" << crop().bottom;
+	  << "_" << crop().bottom
+	  << "_" << colour_conversion().identifier ();
 
 	if (ratio()) {
 		s << "_" << ratio()->id ();
@@ -243,3 +259,53 @@ 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);
+}
+
+/** @return Video size after 3D split and crop */
+libdcp::Size
+VideoContent::video_size_after_crop () const
+{
+	return crop().apply (video_size_after_3d_split ());
+}
+
+/** @param t A time offset from the start of this piece of content.
+ *  @return Corresponding frame index.
+ */
+VideoContent::Frame
+VideoContent::time_to_content_video_frames (Time t) const
+{
+	shared_ptr<const Film> film = _film.lock ();
+	assert (film);
+	
+	FrameRateConversion frc (video_frame_rate(), film->video_frame_rate());
+
+	/* Here we are converting from time (in the DCP) to a frame number in the content.
+	   Hence we need to use the DCP's frame rate and the double/skip correction, not
+	   the source's rate.
+	*/
+	return t * film->video_frame_rate() / (frc.factor() * TIME_HZ);
+}