X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_video.cc;h=4a41e17b9c514fe728a081d0e9f7c453fb05c76b;hb=b603730979665f49af1ca72917c81df79dea6160;hp=9daeb45c8af0ce5afc46d9d7051d7335ba9b4362;hpb=3799e91d126d243d41c44dcb0ca1bfa66b53a57e;p=dcpomatic.git diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc index 9daeb45c8..4a41e17b9 100644 --- a/src/lib/dcp_video.cc +++ b/src/lib/dcp_video.cc @@ -105,7 +105,7 @@ DCPVideo::convert_to_xyz (shared_ptr frame, dcp::NoteHandler { shared_ptr xyz; - auto image = frame->image (bind(&PlayerVideo::keep_xyz_or_rgb, _1), VideoRange::FULL, Image::Alignment::PADDED, false); + auto image = frame->image (bind(&PlayerVideo::keep_xyz_or_rgb, _1), VideoRange::FULL, false); if (frame->colour_conversion()) { xyz = dcp::rgb_to_xyz ( image->data()[0], @@ -125,7 +125,7 @@ DCPVideo::convert_to_xyz (shared_ptr frame, dcp::NoteHandler * @return Encoded data. */ ArrayData -DCPVideo::encode_locally () +DCPVideo::encode_locally () const { auto const comment = Config::instance()->dcp_j2k_comment(); @@ -204,7 +204,7 @@ DCPVideo::encode_locally () * @return Encoded data. */ ArrayData -DCPVideo::encode_remotely (EncodeServerDescription serv, int timeout) +DCPVideo::encode_remotely (EncodeServerDescription serv, int timeout) const { boost::asio::io_service io_service; boost::asio::ip::tcp::resolver resolver (io_service);