X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_video_frame.cc;h=d154ba96b074298824da3713de768e892e6e5ed2;hp=d860c319542bd52296ea0ec37f949d11e64d06dd;hb=39bc73fe192f932ed6695eb87b19de446e8b4f55;hpb=bb0a36c3a6bea9cd1ebdde7b8a3a04765e317569 diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc index d860c3195..d154ba96b 100644 --- a/src/lib/dcp_video_frame.cc +++ b/src/lib/dcp_video_frame.cc @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -59,6 +60,7 @@ #include "image.h" #include "log.h" #include "cross.h" +#include "player_video_frame.h" #include "i18n.h" @@ -73,18 +75,16 @@ using dcp::raw_convert; #define DCI_COEFFICENT (48.0 / 52.37) /** Construct a DCP video frame. - * @param input Input image. - * @param f Index of the frame within the DCP. + * @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. */ DCPVideoFrame::DCPVideoFrame ( - shared_ptr image, int f, Eyes eyes, ColourConversion c, int dcp_fps, int bw, Resolution r, shared_ptr l + shared_ptr frame, int index, int dcp_fps, int bw, Resolution r, shared_ptr l ) - : _image (image) - , _frame (f) - , _eyes (eyes) - , _conversion (c) + : _frame (frame) + , _index (index) , _frames_per_second (dcp_fps) , _j2k_bandwidth (bw) , _resolution (r) @@ -93,22 +93,11 @@ DCPVideoFrame::DCPVideoFrame ( } -DCPVideoFrame::DCPVideoFrame (shared_ptr image, cxml::ConstNodePtr node, shared_ptr log) - : _image (image) +DCPVideoFrame::DCPVideoFrame (shared_ptr frame, shared_ptr node, shared_ptr log) + : _frame (frame) , _log (log) { - _frame = node->number_child ("Frame"); - string const eyes = node->string_child ("Eyes"); - if (eyes == "Both") { - _eyes = EYES_BOTH; - } else if (eyes == "Left") { - _eyes = EYES_LEFT; - } else if (eyes == "Right") { - _eyes = EYES_RIGHT; - } else { - assert (false); - } - _conversion = ColourConversion (node->node_child ("ColourConversion")); + _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)); @@ -120,28 +109,44 @@ DCPVideoFrame::DCPVideoFrame (shared_ptr image, cxml::ConstNodePtr shared_ptr DCPVideoFrame::encode_locally () { - shared_ptr in_lut; - in_lut = dcp::GammaLUT::cache.get (12, _conversion.input_gamma, _conversion.input_gamma_linearised); - + shared_ptr in_lut = dcp::GammaLUT::cache.get ( + 12, _frame->colour_conversion().input_gamma, _frame->colour_conversion().input_gamma_linearised + ); + /* XXX: libdcp should probably use boost */ double matrix[3][3]; for (int i = 0; i < 3; ++i) { for (int j = 0; j < 3; ++j) { - matrix[i][j] = _conversion.matrix (i, j); + matrix[i][j] = _frame->colour_conversion().matrix (i, j); } } - + shared_ptr xyz = dcp::rgb_to_xyz ( - _image, + _frame->image(), in_lut, - dcp::GammaLUT::cache.get (16, 1 / _conversion.output_gamma, false), + dcp::GammaLUT::cache.get (16, 1 / _frame->colour_conversion().output_gamma, false), matrix ); + + { + MD5_CTX md5_context; + MD5_Init (&md5_context); + MD5_Update (&md5_context, xyz->data(0), 1998 * 1080 * 4); + MD5_Update (&md5_context, xyz->data(1), 1998 * 1080 * 4); + MD5_Update (&md5_context, xyz->data(2), 1998 * 1080 * 4); + unsigned char digest[MD5_DIGEST_LENGTH]; + MD5_Final (digest, &md5_context); + stringstream s; + for (int i = 0; i < MD5_DIGEST_LENGTH; ++i) { + s << std::hex << std::setfill('0') << std::setw(2) << ((int) digest[i]); + } + } + /* Set the max image and component sizes based on frame_rate */ int max_cs_len = ((float) _j2k_bandwidth) / 8 / _frames_per_second; - if (_eyes == EYES_LEFT || _eyes == EYES_RIGHT) { + if (_frame->eyes() == EYES_LEFT || _frame->eyes() == EYES_RIGHT) { /* In 3D we have only half the normal bandwidth per eye */ max_cs_len /= 2; } @@ -240,15 +245,15 @@ DCPVideoFrame::encode_locally () throw EncodeError (N_("JPEG2000 encoding failed")); } - switch (_eyes) { + switch (_frame->eyes()) { case EYES_BOTH: - _log->log (String::compose (N_("Finished locally-encoded frame %1 for mono"), _frame)); + _log->log (String::compose (N_("Finished locally-encoded frame %1 for mono"), _index)); break; case EYES_LEFT: - _log->log (String::compose (N_("Finished locally-encoded frame %1 for L"), _frame)); + _log->log (String::compose (N_("Finished locally-encoded frame %1 for L"), _index)); break; case EYES_RIGHT: - _log->log (String::compose (N_("Finished locally-encoded frame %1 for R"), _frame)); + _log->log (String::compose (N_("Finished locally-encoded frame %1 for R"), _index)); break; default: break; @@ -279,28 +284,30 @@ DCPVideoFrame::encode_remotely (ServerDescription serv) socket->connect (*endpoint_iterator); + /* Collect all XML metadata */ xmlpp::Document doc; xmlpp::Element* root = doc.create_root_node ("EncodingRequest"); - root->add_child("Version")->add_child_text (raw_convert (SERVER_LINK_VERSION)); - root->add_child("Width")->add_child_text (raw_convert (_image->size().width)); - root->add_child("Height")->add_child_text (raw_convert (_image->size().height)); add_metadata (root); + _log->log (String::compose (N_("Sending frame %1 to remote"), _index)); + + /* Send XML metadata */ stringstream xml; doc.write_to_stream (xml, "UTF-8"); - - _log->log (String::compose (N_("Sending frame %1 to remote"), _frame)); - socket->write (xml.str().length() + 1); socket->write ((uint8_t *) xml.str().c_str(), xml.str().length() + 1); - _image->write_to_socket (socket); + /* Send binary data */ + _frame->send_binary (socket); + /* Read the response (JPEG2000-encoded data); this blocks until the data + is ready and sent back. + */ shared_ptr e (new RemotelyEncodedData (socket->read_uint32 ())); socket->read (e->data(), e->size()); - _log->log (String::compose (N_("Finished remotely-encoded frame %1"), _frame)); + _log->log (String::compose (N_("Finished remotely-encoded frame %1"), _index)); return e; } @@ -308,27 +315,17 @@ DCPVideoFrame::encode_remotely (ServerDescription serv) void DCPVideoFrame::add_metadata (xmlpp::Element* el) const { - el->add_child("Frame")->add_child_text (raw_convert (_frame)); - - switch (_eyes) { - case EYES_BOTH: - el->add_child("Eyes")->add_child_text ("Both"); - break; - case EYES_LEFT: - el->add_child("Eyes")->add_child_text ("Left"); - break; - case EYES_RIGHT: - el->add_child("Eyes")->add_child_text ("Right"); - break; - default: - assert (false); - } - - _conversion.as_xml (el->add_child("ColourConversion")); - + el->add_child("Index")->add_child_text (raw_convert (_index)); el->add_child("FramesPerSecond")->add_child_text (raw_convert (_frames_per_second)); el->add_child("J2KBandwidth")->add_child_text (raw_convert (_j2k_bandwidth)); el->add_child("Resolution")->add_child_text (raw_convert (int (_resolution))); + _frame->add_metadata (el); +} + +Eyes +DCPVideoFrame::eyes () const +{ + return _frame->eyes (); } EncodedData::EncodedData (int s)