X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_video.cc;h=217b72183c2af0b2d61b945d0b60ba3551c34933;hb=HEAD;hp=8eb76fdd63670bebce5b09156f7900e8b8b9e6d2;hpb=233f8008287c09ed0da6cddba56fb1bd83e21d0f;p=dcpomatic.git 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 frame, shared_ptr -DCPVideo::convert_to_xyz (shared_ptr frame, dcp::NoteHandler note) +DCPVideo::convert_to_xyz (shared_ptr frame) { shared_ptr xyz; @@ -108,8 +108,7 @@ DCPVideo::convert_to_xyz (shared_ptr frame, dcp::NoteHandler image->data()[0], image->size(), image->stride()[0], - frame->colour_conversion().get(), - note + frame->colour_conversion().get() ); } else { xyz = make_shared(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);