X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fserver.cc;h=e4c281172eb552ea7ca7e784a73b0fb08d530959;hb=5f64a83b76dd015cc03d106061bf890d3d80d788;hp=c80527567cbdd58a7c13a55a5e6f0805c37e67d6;hpb=63ea6b6c5ee64f8ee067c2b488d004b6dfe363e0;p=dcpomatic.git diff --git a/src/lib/server.cc b/src/lib/server.cc index c80527567..e4c281172 100644 --- a/src/lib/server.cc +++ b/src/lib/server.cc @@ -28,52 +28,61 @@ #include #include #include +#include +#include #include "server.h" #include "util.h" #include "scaler.h" #include "image.h" #include "dcp_video_frame.h" #include "config.h" -#include "subtitle.h" + +#include "i18n.h" using std::string; using std::stringstream; using std::multimap; using std::vector; -using std::cerr; using boost::shared_ptr; using boost::algorithm::is_any_of; using boost::algorithm::split; using boost::thread; using boost::bind; +using boost::scoped_array; +using boost::optional; +using libdcp::Size; + +ServerDescription::ServerDescription (shared_ptr node) +{ + _host_name = node->string_child ("HostName"); + _threads = node->number_child ("Threads"); +} + +void +ServerDescription::as_xml (xmlpp::Node* root) const +{ + root->add_child("HostName")->add_child_text (_host_name); + root->add_child("Threads")->add_child_text (boost::lexical_cast (_threads)); +} /** Create a server description from a string of metadata returned from as_metadata(). * @param v Metadata. * @return ServerDescription, or 0. */ -ServerDescription * +optional ServerDescription::create_from_metadata (string v) { vector b; - split (b, v, is_any_of (" ")); + split (b, v, is_any_of (N_(" "))); if (b.size() != 2) { - return 0; + return optional (); } - return new ServerDescription (b[0], atoi (b[1].c_str ())); + return ServerDescription (b[0], atoi (b[1].c_str ())); } -/** @return Description of this server as text */ -string -ServerDescription::as_metadata () const -{ - stringstream s; - s << _host_name << " " << _threads; - return s.str (); -} - -Server::Server (Log* log) +Server::Server (shared_ptr log) : _log (log) { @@ -82,56 +91,44 @@ Server::Server (Log* log) int Server::process (shared_ptr socket) { - char buffer[512]; - socket->read_indefinite ((uint8_t *) buffer, sizeof (buffer), 30); - socket->consume (strlen (buffer) + 1); + uint32_t length = socket->read_uint32 (); + scoped_array buffer (new char[length]); + socket->read (reinterpret_cast (buffer.get()), length); - stringstream s (buffer); + stringstream s (buffer.get()); multimap kv = read_key_value (s); if (get_required_string (kv, "encode") != "please") { return -1; } - Size in_size (get_required_int (kv, "input_width"), get_required_int (kv, "input_height")); - int pixel_format_int = get_required_int (kv, "input_pixel_format"); - Size out_size (get_required_int (kv, "output_width"), get_required_int (kv, "output_height")); - int padding = get_required_int (kv, "padding"); - int subtitle_offset = get_required_int (kv, "subtitle_offset"); - float subtitle_scale = get_required_float (kv, "subtitle_scale"); - string scaler_id = get_required_string (kv, "scaler"); + libdcp::Size size (get_required_int (kv, "width"), get_required_int (kv, "height")); int frame = get_required_int (kv, "frame"); int frames_per_second = get_required_int (kv, "frames_per_second"); - string post_process = get_optional_string (kv, "post_process"); - int colour_lut_index = get_required_int (kv, "colour_lut"); int j2k_bandwidth = get_required_int (kv, "j2k_bandwidth"); - Position subtitle_position (get_optional_int (kv, "subtitle_x"), get_optional_int (kv, "subtitle_y")); - Size subtitle_size (get_optional_int (kv, "subtitle_width"), get_optional_int (kv, "subtitle_height")); + Eyes eyes = static_cast (get_required_int (kv, "eyes")); - /* This checks that colour_lut_index is within range */ - colour_lut_index_to_name (colour_lut_index); - - PixelFormat pixel_format = (PixelFormat) pixel_format_int; - Scaler const * scaler = Scaler::from_id (scaler_id); - - shared_ptr image (new AlignedImage (pixel_format, in_size)); + shared_ptr image (new Image (PIX_FMT_RGB24, size, true)); image->read_from_socket (socket); - shared_ptr sub; - if (subtitle_size.width && subtitle_size.height) { - shared_ptr subtitle_image (new AlignedImage (PIX_FMT_RGBA, subtitle_size)); - subtitle_image->read_from_socket (socket); - sub.reset (new Subtitle (subtitle_position, subtitle_image)); - } + /* XXX: colour conversion... */ DCPVideoFrame dcp_video_frame ( - image, sub, out_size, padding, subtitle_offset, subtitle_scale, - scaler, frame, frames_per_second, post_process, colour_lut_index, j2k_bandwidth, _log + image, frame, eyes, ColourConversion(), frames_per_second, j2k_bandwidth, _log ); shared_ptr encoded = dcp_video_frame.encode_locally (); - encoded->send (socket); + try { + encoded->send (socket); + } catch (std::exception& e) { + _log->log (String::compose ( + N_("Send failed; frame %1, data size %2, pixel format %3, image size %4x%5, %6 components"), + frame, encoded->size(), image->pixel_format(), image->size().width, image->size().height, image->components() + ) + ); + throw; + } return frame; } @@ -158,7 +155,7 @@ Server::worker_thread () try { frame = process (socket); } catch (std::exception& e) { - cerr << "Error: " << e.what() << "\n"; + _log->log (String::compose (N_("Error: %1"), e.what())); } socket.reset (); @@ -168,7 +165,7 @@ Server::worker_thread () if (frame >= 0) { struct timeval end; gettimeofday (&end, 0); - _log->log (String::compose ("Encoded frame %1 in %2", frame, seconds (end) - seconds (start))); + _log->log (String::compose (N_("Encoded frame %1 in %2"), frame, seconds (end) - seconds (start))); } _worker_condition.notify_all (); @@ -178,7 +175,7 @@ Server::worker_thread () void Server::run (int num_threads) { - _log->log (String::compose ("Server starting with %1 threads", num_threads)); + _log->log (String::compose (N_("Server starting with %1 threads"), num_threads)); for (int i = 0; i < num_threads; ++i) { _worker_threads.push_back (new thread (bind (&Server::worker_thread, this)));