diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-12 23:12:41 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-12 23:12:41 +0100 |
| commit | 5f1046a2164fff00a6fc74aecf4cacbca531d415 (patch) | |
| tree | c166fd8ecabede8c954e7289723aa9872d3c826a /src/lib/dcp_video_frame.cc | |
| parent | 07ba15f367b36d17ec60edf77aa57fd20ee76740 (diff) | |
Remove entirely untested colour LUT options.
Diffstat (limited to 'src/lib/dcp_video_frame.cc')
| -rw-r--r-- | src/lib/dcp_video_frame.cc | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc index 39334d3c7..22a7c5795 100644 --- a/src/lib/dcp_video_frame.cc +++ b/src/lib/dcp_video_frame.cc @@ -73,17 +73,15 @@ using libdcp::Size; /** Construct a DCP video frame. * @param input Input image. * @param f Index of the frame within the DCP. - * @param clut Colour look-up table to use (see Config::colour_lut_index ()) * @param bw J2K bandwidth to use (see Config::j2k_bandwidth ()) * @param l Log to write to. */ DCPVideoFrame::DCPVideoFrame ( - shared_ptr<const Image> image, int f, int dcp_fps, int clut, int bw, shared_ptr<Log> l + shared_ptr<const Image> image, int f, int dcp_fps, int bw, shared_ptr<Log> l ) : _image (image) , _frame (f) , _frames_per_second (dcp_fps) - , _colour_lut (clut) , _j2k_bandwidth (bw) , _log (l) , _parameters (0) @@ -116,19 +114,11 @@ DCPVideoFrame::~DCPVideoFrame () shared_ptr<EncodedData> DCPVideoFrame::encode_locally () { - /* In sRGB / Rec709 gamma LUT */ - shared_ptr<libdcp::LUT> lut_in; - if (_colour_lut == 0) { - lut_in = libdcp::SRGBLinearisedGammaLUT::cache.get (12, 2.4); - } else { - lut_in = libdcp::Rec709LinearisedGammaLUT::cache.get (12, 1 / 0.45); - } - - /* Out DCI gamma LUT */ - shared_ptr<libdcp::LUT> lut_out = libdcp::GammaLUT::cache.get (16, 1 / 2.6); - shared_ptr<libdcp::XYZFrame> xyz = libdcp::rgb_to_xyz ( - _image, lut_in, lut_out, _colour_lut == 0 ? libdcp::colour_matrix::srgb_to_xyz : libdcp::colour_matrix::rec709_to_xyz + _image, + libdcp::SRGBLinearisedGammaLUT::cache.get (12, 2.4), + libdcp::GammaLUT::cache.get (16, 1 / 2.6), + libdcp::colour_matrix::srgb_to_xyz ); /* Set the max image and component sizes based on frame_rate */ @@ -234,7 +224,6 @@ DCPVideoFrame::encode_remotely (ServerDescription const * serv) << N_("height ") << _image->size().height << N_("\n") << N_("frame ") << _frame << N_("\n") << N_("frames_per_second ") << _frames_per_second << N_("\n") - << N_("colour_lut ") << _colour_lut << N_("\n") << N_("j2k_bandwidth ") << _j2k_bandwidth << N_("\n"); _log->log (String::compose ( |