X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_video_frame.cc;h=1aae64ac7aafd98fa40e59316dcb73872fc421b0;hp=6cf987648773031a5cb2ed859f3fe4596446fe04;hb=3574212ee42b2bd924eb95d5c0f4f69ec9e0a2f0;hpb=8fb0f4eaa6d91ca9369f45dd7a57c29149edaaac

diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc
index 6cf987648..1aae64ac7 100644
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@ -42,14 +42,13 @@
 #include <boost/array.hpp>
 #include <boost/asio.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/lexical_cast.hpp>
 #include <openssl/md5.h>
-#include <libdcp/rec709_linearised_gamma_lut.h>
-#include <libdcp/srgb_linearised_gamma_lut.h>
-#include <libdcp/gamma_lut.h>
-#include <libdcp/xyz_frame.h>
-#include <libdcp/rgb_xyz.h>
-#include <libdcp/colour_matrix.h>
-#include <libdcp/raw_convert.h>
+#include <dcp/gamma_lut.h>
+#include <dcp/xyz_frame.h>
+#include <dcp/rgb_xyz.h>
+#include <dcp/colour_matrix.h>
+#include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
 #include "film.h"
 #include "dcp_video_frame.h"
@@ -71,8 +70,9 @@ using std::string;
 using std::stringstream;
 using std::cout;
 using boost::shared_ptr;
-using libdcp::Size;
-using libdcp::raw_convert;
+using boost::lexical_cast;
+using dcp::Size;
+using dcp::raw_convert;
 
 #define DCI_COEFFICENT (48.0 / 52.37)
 
@@ -111,13 +111,10 @@ DCPVideoFrame::DCPVideoFrame (shared_ptr<const PlayerVideoFrame> frame, shared_p
 shared_ptr<EncodedData>
 DCPVideoFrame::encode_locally ()
 {
-	shared_ptr<libdcp::LUT> in_lut;
-	if (_frame->colour_conversion().input_gamma_linearised) {
-		in_lut = libdcp::SRGBLinearisedGammaLUT::cache.get (12, _frame->colour_conversion().input_gamma);
-	} else {
-		in_lut = libdcp::GammaLUT::cache.get (12, _frame->colour_conversion().input_gamma);
-	}
-
+	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];
@@ -127,10 +124,10 @@ DCPVideoFrame::encode_locally ()
 		}
 	}
 
-	shared_ptr<libdcp::XYZFrame> xyz = libdcp::rgb_to_xyz (
+	shared_ptr<dcp::XYZFrame> xyz = dcp::rgb_to_xyz (
 		_frame->image(),
 		in_lut,
-		libdcp::GammaLUT::cache.get (16, 1 / _frame->colour_conversion().output_gamma),
+		dcp::GammaLUT::cache.get (16, 1 / _frame->colour_conversion().output_gamma, false),
 		matrix
 		);
 
@@ -390,7 +387,7 @@ EncodedData::write (shared_ptr<const Film> film, int frame, Eyes eyes) const
 }
 
 void
-EncodedData::write_info (shared_ptr<const Film> film, int frame, Eyes eyes, libdcp::FrameInfo fin) const
+EncodedData::write_info (shared_ptr<const Film> film, int frame, Eyes eyes, dcp::FrameInfo fin) const
 {
 	boost::filesystem::path const info = film->info_path (frame, eyes);
 	FILE* h = fopen_boost (info, "w");