X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_video.cc;fp=src%2Flib%2Fdcp_video.cc;h=52b9d5a03741a4e16c4cc4080d2e84db08706202;hb=83401fffc9f7bfea8c167ecbeec0949e22d76548;hp=e4977726535b47f6c34d56ad0b253ca79c6f7d66;hpb=d37f7f314aebb48ce42e57011b1966d113686c8f;p=dcpomatic.git diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc index e49777265..52b9d5a03 100644 --- a/src/lib/dcp_video.cc +++ b/src/lib/dcp_video.cc @@ -114,7 +114,8 @@ DCPVideo::encode_locally () const int const minimum_size = 16384; LOG_DEBUG_ENCODE("Using minimum frame size %1", minimum_size); - auto xyz = _frame->convert_to_xyz(boost::bind(&Log::dcp_log, dcpomatic_log.get(), _1, _2)); + auto frame_image = _frame->image(bind(&PlayerVideo::keep_xyz_or_rgb, _1), VideoRange::FULL, false); + auto xyz = _frame->convert_to_xyz(frame_image, boost::bind(&Log::dcp_log, dcpomatic_log.get(), _1, _2)); int noise_amount = 2; int pixel_skip = 16; while (true) { @@ -139,7 +140,7 @@ DCPVideo::encode_locally () const * convert_to_xyz() again because compress_j2k() corrupts its xyz parameter. */ - xyz = _frame->convert_to_xyz(boost::bind(&Log::dcp_log, dcpomatic_log.get(), _1, _2)); + xyz = _frame->convert_to_xyz(frame_image, boost::bind(&Log::dcp_log, dcpomatic_log.get(), _1, _2)); auto size = xyz->size (); auto pixels = size.width * size.height; dcpomatic::RNG rng(42);