X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_video.cc;h=ddad3d8e06ac2949cb04a36e8087cc4f32495a04;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=be69f3eedc1255740f221379b53c229a8833688b;hpb=a8a0dfd1b21de6c0facf965ab119833ff6f790bf;p=dcpomatic.git diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc index be69f3eed..ddad3d8e0 100644 --- a/src/lib/dcp_video.cc +++ b/src/lib/dcp_video.cc @@ -35,33 +35,36 @@ #include "dcpomatic_socket.h" #include "image.h" #include "log.h" +#include "dcpomatic_log.h" #include "cross.h" #include "player_video.h" -#include "raw_convert.h" #include "compose.hpp" +#include "warnings.h" #include +#include #include #include #include -#include +DCPOMATIC_DISABLE_WARNINGS #include +DCPOMATIC_ENABLE_WARNINGS #include #include #include #include #include -#define LOG_GENERAL(...) _log->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL); -#define LOG_DEBUG_ENCODE(...) _log->log (String::compose (__VA_ARGS__), LogEntry::TYPE_DEBUG_ENCODE); -#define LOG_TIMING(...) _log->log (String::compose (__VA_ARGS__), LogEntry::TYPE_TIMING); - #include "i18n.h" using std::string; using std::cout; -using boost::shared_ptr; +using std::shared_ptr; using dcp::Size; -using dcp::Data; +using dcp::ArrayData; +using dcp::raw_convert; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif #define DCI_COEFFICENT (48.0 / 52.37) @@ -69,24 +72,21 @@ using dcp::Data; * @param frame Input frame. * @param index Index of the frame within the DCP. * @param bw J2K bandwidth to use (see Config::j2k_bandwidth ()) - * @param l Log to write to. */ DCPVideo::DCPVideo ( - shared_ptr frame, int index, int dcp_fps, int bw, Resolution r, shared_ptr l + shared_ptr frame, int index, int dcp_fps, int bw, Resolution r ) : _frame (frame) , _index (index) , _frames_per_second (dcp_fps) , _j2k_bandwidth (bw) , _resolution (r) - , _log (l) { } -DCPVideo::DCPVideo (shared_ptr frame, shared_ptr node, shared_ptr log) +DCPVideo::DCPVideo (shared_ptr frame, shared_ptr node) : _frame (frame) - , _log (log) { _index = node->number_child ("Index"); _frames_per_second = node->number_child ("FramesPerSecond"); @@ -99,7 +99,7 @@ DCPVideo::convert_to_xyz (shared_ptr frame, dcp::NoteHandler { shared_ptr xyz; - shared_ptr image = frame->image (note, bind (&PlayerVideo::keep_xyz_or_rgb, _1), true, false); + shared_ptr image = frame->image (bind (&PlayerVideo::keep_xyz_or_rgb, _1), VIDEO_RANGE_FULL, true, false); if (frame->colour_conversion()) { xyz = dcp::rgb_to_xyz ( image->data()[0], @@ -109,7 +109,7 @@ DCPVideo::convert_to_xyz (shared_ptr frame, dcp::NoteHandler note ); } else { - xyz = dcp::xyz_to_xyz (image->data()[0], image->size(), image->stride()[0]); + xyz.reset (new dcp::OpenJPEGImage (image->data()[0], image->size(), image->stride()[0])); } return xyz; @@ -118,15 +118,18 @@ DCPVideo::convert_to_xyz (shared_ptr frame, dcp::NoteHandler /** J2K-encode this frame on the local host. * @return Encoded data. */ -Data -DCPVideo::encode_locally (dcp::NoteHandler note) +ArrayData +DCPVideo::encode_locally () { - Data enc = compress_j2k ( - convert_to_xyz (_frame, note), + string const comment = Config::instance()->dcp_j2k_comment(); + + ArrayData enc = dcp::compress_j2k ( + convert_to_xyz (_frame, boost::bind(&Log::dcp_log, dcpomatic_log.get(), _1, _2)), _j2k_bandwidth, _frames_per_second, _frame->eyes() == EYES_LEFT || _frame->eyes() == EYES_RIGHT, - _resolution == RESOLUTION_4K + _resolution == RESOLUTION_4K, + comment.empty() ? "libdcp" : comment ); switch (_frame->eyes()) { @@ -148,14 +151,15 @@ DCPVideo::encode_locally (dcp::NoteHandler note) /** Send this frame to a remote server for J2K encoding, then read the result. * @param serv Server to send to. + * @param timeout timeout in seconds. * @return Encoded data. */ -Data +ArrayData DCPVideo::encode_remotely (EncodeServerDescription serv, int timeout) { boost::asio::io_service io_service; boost::asio::ip::tcp::resolver resolver (io_service); - boost::asio::ip::tcp::resolver::query query (serv.host_name(), raw_convert (Config::instance()->server_port_base ())); + boost::asio::ip::tcp::resolver::query query (serv.host_name(), raw_convert (ENCODE_FRAME_PORT)); boost::asio::ip::tcp::resolver::iterator endpoint_iterator = resolver.resolve (query); shared_ptr socket (new Socket (timeout)); @@ -170,23 +174,31 @@ DCPVideo::encode_remotely (EncodeServerDescription serv, int timeout) LOG_DEBUG_ENCODE (N_("Sending frame %1 to remote"), _index); - /* Send XML metadata */ - string xml = doc.write_to_string ("UTF-8"); - socket->write (xml.length() + 1); - socket->write ((uint8_t *) xml.c_str(), xml.length() + 1); + { + Socket::WriteDigestScope ds (socket); - /* Send binary data */ - LOG_TIMING("start-remote-send thread=%1", boost::this_thread::get_id()); - _frame->send_binary (socket); + /* Send XML metadata */ + string xml = doc.write_to_string ("UTF-8"); + socket->write (xml.length() + 1); + socket->write ((uint8_t *) xml.c_str(), xml.length() + 1); + + /* Send binary data */ + LOG_TIMING("start-remote-send thread=%1", thread_id ()); + _frame->write_to_socket (socket); + } /* Read the response (JPEG2000-encoded data); this blocks until the data is ready and sent back. */ - LOG_TIMING("start-remote-encode thread=%1", boost::this_thread::get_id ()); - Data e (socket->read_uint32 ()); - LOG_TIMING("start-remote-receive thread=%1", boost::this_thread::get_id ()); - socket->read (e.data().get(), e.size()); - LOG_TIMING("finish-remote-receive thread=%1", boost::this_thread::get_id ()); + Socket::ReadDigestScope ds (socket); + LOG_TIMING("start-remote-encode thread=%1", thread_id ()); + ArrayData e (socket->read_uint32 ()); + LOG_TIMING("start-remote-receive thread=%1", thread_id ()); + socket->read (e.data(), e.size()); + LOG_TIMING("finish-remote-receive thread=%1", thread_id ()); + if (!ds.check()) { + throw NetworkError ("Checksums do not match"); + } LOG_DEBUG_ENCODE (N_("Finished remotely-encoded frame %1"), _index);