X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_video.cc;h=58e10f0ed69f349b65d5c51b92b89f59a872205d;hb=8fedaaa75c4586a4cc7ffb393bd71d1fdb091dc8;hp=89f541d8545d8c7333406ab73b76dbe108427aba;hpb=8e96f8c1677146d224438ec040982532879d6c34;p=dcpomatic.git diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc index 89f541d85..58e10f0ed 100644 --- a/src/lib/dcp_video.cc +++ b/src/lib/dcp_video.cc @@ -35,34 +35,37 @@ #include "dcpomatic_socket.h" #include "image.h" #include "log.h" +#include "dcpomatic_log.h" #include "cross.h" #include "player_video.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::make_shared; +using std::shared_ptr; +using std::string; 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) @@ -70,29 +73,26 @@ using dcp::raw_convert; * @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"); _j2k_bandwidth = node->number_child ("J2KBandwidth"); - _resolution = Resolution (node->optional_number_child("Resolution").get_value_or (RESOLUTION_2K)); + _resolution = Resolution (node->optional_number_child("Resolution").get_value_or(static_cast(Resolution::TWO_K))); } shared_ptr @@ -100,7 +100,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); + auto image = frame->image (bind(&PlayerVideo::keep_xyz_or_rgb, _1), VideoRange::FULL, true, false); if (frame->colour_conversion()) { xyz = dcp::rgb_to_xyz ( image->data()[0], @@ -110,7 +110,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 = make_shared(image->data()[0], image->size(), image->stride()[0]); } return xyz; @@ -119,25 +119,28 @@ 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), + auto const comment = Config::instance()->dcp_j2k_comment(); + + auto 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 + _frame->eyes() == Eyes::LEFT || _frame->eyes() == Eyes::RIGHT, + _resolution == Resolution::FOUR_K, + comment.empty() ? "libdcp" : comment ); switch (_frame->eyes()) { - case EYES_BOTH: + case Eyes::BOTH: LOG_DEBUG_ENCODE (N_("Finished locally-encoded frame %1 for mono"), _index); break; - case EYES_LEFT: + case Eyes::LEFT: LOG_DEBUG_ENCODE (N_("Finished locally-encoded frame %1 for L"), _index); break; - case EYES_RIGHT: + case Eyes::RIGHT: LOG_DEBUG_ENCODE (N_("Finished locally-encoded frame %1 for R"), _index); break; default: @@ -149,45 +152,54 @@ 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)); + auto socket = make_shared(timeout); socket->connect (*endpoint_iterator); /* Collect all XML metadata */ xmlpp::Document doc; - xmlpp::Element* root = doc.create_root_node ("EncodingRequest"); + auto root = doc.create_root_node ("EncodingRequest"); root->add_child("Version")->add_child_text (raw_convert (SERVER_LINK_VERSION)); add_metadata (root); 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", thread_id ()); - _frame->send_binary (socket); + /* Send XML metadata */ + auto 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. */ + Socket::ReadDigestScope ds (socket); LOG_TIMING("start-remote-encode thread=%1", thread_id ()); - Data e (socket->read_uint32 ()); + ArrayData e (socket->read_uint32 ()); LOG_TIMING("start-remote-receive thread=%1", thread_id ()); - socket->read (e.data().get(), e.size()); + 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);