X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_video.cc;h=cacba190f87603dfa5d12a1a27c953229af959a5;hb=b6c780d3107557d452c6612d715d01e2be52dbda;hp=d849866512d4cdc0e983ca42201631fe3fe88d70;hpb=7979aeb87a83de31c4cf25f88eef4fbca4b56553;p=dcpomatic.git

diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc
index d84986651..cacba190f 100644
--- a/src/lib/dcp_video.cc
+++ b/src/lib/dcp_video.cc
@@ -111,26 +111,33 @@ DCPVideo::DCPVideo (shared_ptr<const PlayerVideo> frame, shared_ptr<const cxml::
 shared_ptr<EncodedData>
 DCPVideo::encode_locally ()
 {
-	shared_ptr<dcp::GammaLUT> in_lut = dcp::GammaLUT::cache.get (
-		12, _frame->colour_conversion().input_gamma, _frame->colour_conversion().input_gamma_linearised
-		);
-	
-	/* XXX: libdcp should probably use boost */
-	
-	double matrix[3][3];
-	for (int i = 0; i < 3; ++i) {
-		for (int j = 0; j < 3; ++j) {
-			matrix[i][j] = _frame->colour_conversion().matrix (i, j);
+	shared_ptr<dcp::XYZFrame> xyz;
+
+	if (_frame->colour_conversion()) {
+		ColourConversion conversion = _frame->colour_conversion().get ();
+		shared_ptr<dcp::GammaLUT> in_lut = dcp::GammaLUT::cache.get (
+			12, conversion.input_gamma, conversion.input_gamma_linearised
+			);
+		
+		/* XXX: dcp should probably use boost */
+		
+		double matrix[3][3];
+		for (int i = 0; i < 3; ++i) {
+			for (int j = 0; j < 3; ++j) {
+				matrix[i][j] = conversion.matrix (i, j);
+			}
 		}
+		
+		xyz = dcp::rgb_to_xyz (
+			_frame->image (AV_PIX_FMT_RGB48LE, _burn_subtitles),
+			in_lut,
+			dcp::GammaLUT::cache.get (16, 1 / conversion.output_gamma, false),
+			matrix
+			);
+	} else {
+		xyz = dcp::xyz_to_xyz (_frame->image (AV_PIX_FMT_RGB48LE, _burn_subtitles));
 	}
 
-	shared_ptr<dcp::XYZFrame> xyz = dcp::rgb_to_xyz (
-		_frame->image (_burn_subtitles),
-		in_lut,
-		dcp::GammaLUT::cache.get (16, 1 / _frame->colour_conversion().output_gamma, false),
-		matrix
-		);
-
 	/* Set the max image and component sizes based on frame_rate */
 	int max_cs_len = ((float) _j2k_bandwidth) / 8 / _frames_per_second;
 	if (_frame->eyes() == EYES_LEFT || _frame->eyes() == EYES_RIGHT) {
@@ -315,3 +322,18 @@ DCPVideo::eyes () const
 	return _frame->eyes ();
 }
 
+/** @return true if this DCPVideo is definitely the same as another;
+ *  (apart from the frame index), false if it is probably not.
+ */
+bool
+DCPVideo::same (shared_ptr<const DCPVideo> other) const
+{
+	if (_frames_per_second != other->_frames_per_second ||
+	    _j2k_bandwidth != other->_j2k_bandwidth ||
+	    _resolution != other->_resolution ||
+	    _burn_subtitles != other->_burn_subtitles) {
+		return false;
+	}
+
+	return _frame->same (other->_frame);
+}