X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_video_frame.cc;h=25abd6f0df57ee7f9f0304e9713b919052639c00;hb=f660fe3f1be97f373318806a77b3ce3fcd53cb73;hp=10f1e4ad170816ff1e44b15f982051f0f8a5ba92;hpb=2c4023c4f8e9ed5c09a30e28cc0bf8633b7635a3;p=dcpomatic.git diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc index 10f1e4ad1..25abd6f0d 100644 --- a/src/lib/dcp_video_frame.cc +++ b/src/lib/dcp_video_frame.cc @@ -49,6 +49,7 @@ #include #include #include +#include #include "film.h" #include "dcp_video_frame.h" #include "config.h" @@ -66,6 +67,7 @@ using std::stringstream; using std::ofstream; using std::cout; using boost::shared_ptr; +using boost::lexical_cast; using libdcp::Size; #define DCI_COEFFICENT (48.0 / 52.37) @@ -77,11 +79,12 @@ using libdcp::Size; * @param l Log to write to. */ DCPVideoFrame::DCPVideoFrame ( - shared_ptr image, int f, Eyes eyes, int dcp_fps, int bw, shared_ptr l + shared_ptr image, int f, Eyes eyes, ColourConversion c, int dcp_fps, int bw, shared_ptr l ) : _image (image) , _frame (f) , _eyes (eyes) + , _conversion (c) , _frames_per_second (dcp_fps) , _j2k_bandwidth (bw) , _log (l) @@ -89,17 +92,53 @@ DCPVideoFrame::DCPVideoFrame ( } +DCPVideoFrame::DCPVideoFrame (shared_ptr image, shared_ptr node, shared_ptr log) + : _image (image) + , _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")); + _frames_per_second = node->number_child ("FramesPerSecond"); + _j2k_bandwidth = node->number_child ("J2KBandwidth"); +} + /** J2K-encode this frame on the local host. * @return Encoded data. */ shared_ptr DCPVideoFrame::encode_locally () { + shared_ptr in_lut; + if (_conversion.input_gamma_linearised) { + in_lut = libdcp::SRGBLinearisedGammaLUT::cache.get (12, _conversion.input_gamma); + } else { + in_lut = libdcp::GammaLUT::cache.get (12, _conversion.input_gamma); + } + + /* 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); + } + } + shared_ptr xyz = libdcp::rgb_to_xyz ( _image, - libdcp::SRGBLinearisedGammaLUT::cache.get (12, 2.4), - libdcp::GammaLUT::cache.get (16, 1 / 2.6), - libdcp::colour_matrix::srgb_to_xyz + in_lut, + libdcp::GammaLUT::cache.get (16, 1 / _conversion.output_gamma), + matrix ); /* Set the max image and component sizes based on frame_rate */ @@ -185,7 +224,19 @@ DCPVideoFrame::encode_locally () throw EncodeError (N_("JPEG2000 encoding failed")); } - _log->log (String::compose (N_("Finished locally-encoded frame %1"), _frame)); + switch (_eyes) { + case EYES_BOTH: + _log->log (String::compose (N_("Finished locally-encoded frame %1 for mono"), _frame)); + break; + case EYES_LEFT: + _log->log (String::compose (N_("Finished locally-encoded frame %1 for L"), _frame)); + break; + case EYES_RIGHT: + _log->log (String::compose (N_("Finished locally-encoded frame %1 for R"), _frame)); + break; + default: + break; + } shared_ptr enc (new LocallyEncodedData (cio->buffer, cio_tell (cio))); @@ -201,25 +252,27 @@ DCPVideoFrame::encode_locally () * @return Encoded data. */ shared_ptr -DCPVideoFrame::encode_remotely (ServerDescription const * serv) +DCPVideoFrame::encode_remotely (ServerDescription serv) { boost::asio::io_service io_service; boost::asio::ip::tcp::resolver resolver (io_service); - boost::asio::ip::tcp::resolver::query query (serv->host_name(), boost::lexical_cast (Config::instance()->server_port ())); + boost::asio::ip::tcp::resolver::query query (serv.host_name(), boost::lexical_cast (Config::instance()->server_port_base ())); boost::asio::ip::tcp::resolver::iterator endpoint_iterator = resolver.resolve (query); shared_ptr socket (new Socket); socket->connect (*endpoint_iterator); - stringstream s; - s << "encode please\n" - << "width " << _image->size().width << "\n" - << "height " << _image->size().height << "\n" - << "eyes " << static_cast (_eyes) << "\n" - << "frame " << _frame << "\n" - << "frames_per_second " << _frames_per_second << "\n" - << "j2k_bandwidth " << _j2k_bandwidth << "\n"; + xmlpp::Document doc; + xmlpp::Element* root = doc.create_root_node ("EncodingRequest"); + + root->add_child("Version")->add_child_text (lexical_cast (SERVER_LINK_VERSION)); + root->add_child("Width")->add_child_text (lexical_cast (_image->size().width)); + root->add_child("Height")->add_child_text (lexical_cast (_image->size().height)); + add_metadata (root); + + stringstream xml; + doc.write_to_stream (xml, "UTF-8"); _log->log (String::compose ( N_("Sending to remote; pixel format %1, components %2, lines (%3,%4,%5), line sizes (%6,%7,%8)"), @@ -228,8 +281,8 @@ DCPVideoFrame::encode_remotely (ServerDescription const * serv) _image->line_size()[0], _image->line_size()[1], _image->line_size()[2] )); - socket->write (s.str().length() + 1); - socket->write ((uint8_t *) s.str().c_str(), s.str().length() + 1); + socket->write (xml.str().length() + 1); + socket->write ((uint8_t *) xml.str().c_str(), xml.str().length() + 1); _image->write_to_socket (socket); @@ -241,6 +294,31 @@ DCPVideoFrame::encode_remotely (ServerDescription const * serv) return e; } +void +DCPVideoFrame::add_metadata (xmlpp::Element* el) const +{ + el->add_child("Frame")->add_child_text (lexical_cast (_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("FramesPerSecond")->add_child_text (lexical_cast (_frames_per_second)); + el->add_child("J2KBandwidth")->add_child_text (lexical_cast (_j2k_bandwidth)); +} + EncodedData::EncodedData (int s) : _data (new uint8_t[s]) , _size (s) @@ -248,12 +326,12 @@ EncodedData::EncodedData (int s) } -EncodedData::EncodedData (string file) +EncodedData::EncodedData (boost::filesystem::path file) { _size = boost::filesystem::file_size (file); _data = new uint8_t[_size]; - FILE* f = fopen (file.c_str(), N_("rb")); + FILE* f = fopen (file.string().c_str(), N_("rb")); if (!f) { throw FileError (_("could not open file for reading"), file); } @@ -280,9 +358,9 @@ EncodedData::~EncodedData () void EncodedData::write (shared_ptr film, int frame, Eyes eyes) const { - string const tmp_j2c = film->j2c_path (frame, eyes, true); + boost::filesystem::path const tmp_j2c = film->j2c_path (frame, eyes, true); - FILE* f = fopen (tmp_j2c.c_str (), N_("wb")); + FILE* f = fopen (tmp_j2c.string().c_str (), N_("wb")); if (!f) { throw WriteFileError (tmp_j2c, errno); @@ -291,7 +369,7 @@ EncodedData::write (shared_ptr film, int frame, Eyes eyes) const fwrite (_data, 1, _size, f); fclose (f); - string const real_j2c = film->j2c_path (frame, eyes, false); + boost::filesystem::path const real_j2c = film->j2c_path (frame, eyes, false); /* Rename the file from foo.j2c.tmp to foo.j2c now that it is complete */ boost::filesystem::rename (tmp_j2c, real_j2c); @@ -300,8 +378,8 @@ EncodedData::write (shared_ptr film, int frame, Eyes eyes) const void EncodedData::write_info (shared_ptr film, int frame, Eyes eyes, libdcp::FrameInfo fin) const { - string const info = film->info_path (frame, eyes); - ofstream h (info.c_str()); + boost::filesystem::path const info = film->info_path (frame, eyes); + ofstream h (info.string().c_str()); fin.write (h); }