diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-10-28 01:51:51 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-10-28 02:30:08 +0200 |
| commit | 157728fb69167da75aa04f6d78fdb6cc274a7db2 (patch) | |
| tree | 07bcf63f13484e9c5275766060d16e579fa28ea0 /src/lib/dcp_video.cc | |
| parent | 6e1c0f245a3940da7da175a978c0561711cfb447 (diff) | |
Use updated libdcp, including an optimisation for rgb-onto-xyz12.
Diffstat (limited to 'src/lib/dcp_video.cc')
| -rw-r--r-- | src/lib/dcp_video.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc index 8eb76fdd6..217b72183 100644 --- a/src/lib/dcp_video.cc +++ b/src/lib/dcp_video.cc @@ -98,7 +98,7 @@ DCPVideo::DCPVideo (shared_ptr<const PlayerVideo> frame, shared_ptr<const cxml:: } shared_ptr<dcp::OpenJPEGImage> -DCPVideo::convert_to_xyz (shared_ptr<const PlayerVideo> frame, dcp::NoteHandler note) +DCPVideo::convert_to_xyz (shared_ptr<const PlayerVideo> frame) { shared_ptr<dcp::OpenJPEGImage> xyz; @@ -108,8 +108,7 @@ DCPVideo::convert_to_xyz (shared_ptr<const PlayerVideo> frame, dcp::NoteHandler image->data()[0], image->size(), image->stride()[0], - frame->colour_conversion().get(), - note + frame->colour_conversion().get() ); } else { xyz = make_shared<dcp::OpenJPEGImage>(image->data()[0], image->size(), image->stride()[0]); @@ -131,7 +130,7 @@ DCPVideo::encode_locally () const int const minimum_size = 16384; LOG_DEBUG_ENCODE("Using minimum frame size %1", minimum_size); - auto xyz = convert_to_xyz (_frame, boost::bind(&Log::dcp_log, dcpomatic_log.get(), _1, _2)); + auto xyz = convert_to_xyz(_frame); int noise_amount = 2; int pixel_skip = 16; while (true) { @@ -156,7 +155,7 @@ DCPVideo::encode_locally () const * convert_to_xyz() again because compress_j2k() corrupts its xyz parameter. */ - xyz = convert_to_xyz (_frame, boost::bind(&Log::dcp_log, dcpomatic_log.get(), _1, _2)); + xyz = convert_to_xyz(_frame); auto size = xyz->size (); auto pixels = size.width * size.height; dcpomatic::RNG rng(42); |