X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fserver.cc;h=07b82694666c3146be87fbae45d13cf4722f19d4;hb=996b0c06e23bcb6b300d7b8799df94993692e07d;hp=d40325db0055b7350c8bb04e8df5ca2f25a9200f;hpb=bd9906422fe59126a27a3002b2bb4ce497eef508;p=dcpomatic.git diff --git a/src/lib/server.cc b/src/lib/server.cc index d40325db0..07b826946 100644 --- a/src/lib/server.cc +++ b/src/lib/server.cc @@ -27,6 +27,9 @@ #include #include #include +#include +#include +#include #include "server.h" #include "util.h" #include "scaler.h" @@ -35,8 +38,32 @@ #include "config.h" #include "subtitle.h" -using namespace std; -using namespace boost; +#include "i18n.h" + +using std::string; +using std::stringstream; +using std::multimap; +using std::vector; +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 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. @@ -46,7 +73,7 @@ ServerDescription * 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; @@ -55,16 +82,7 @@ ServerDescription::create_from_metadata (string v) return new 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) { @@ -73,72 +91,64 @@ Server::Server (Log* log) int Server::process (shared_ptr socket) { - char buffer[256]; - 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); - string command; - s >> command; - if (command != "encode") { + if (get_required_string (kv, N_("encode")) != N_("please")) { return -1; } - Size in_size; - int pixel_format_int; - Size out_size; - int padding; - int subtitle_offset; - int subtitle_scale; - string scaler_id; - int frame; - float frames_per_second; - string post_process; - int colour_lut_index; - int j2k_bandwidth; - Position subtitle_position; - Size subtitle_size; - - s >> in_size.width >> in_size.height - >> pixel_format_int - >> out_size.width >> out_size.height - >> padding - >> subtitle_offset - >> subtitle_scale - >> scaler_id - >> frame - >> frames_per_second - >> post_process - >> colour_lut_index - >> j2k_bandwidth - >> subtitle_position.x >> subtitle_position.y - >> subtitle_size.width >> subtitle_size.height; + libdcp::Size in_size (get_required_int (kv, N_("input_width")), get_required_int (kv, N_("input_height"))); + int pixel_format_int = get_required_int (kv, N_("input_pixel_format")); + libdcp::Size out_size (get_required_int (kv, N_("output_width")), get_required_int (kv, N_("output_height"))); + int padding = get_required_int (kv, N_("padding")); + int subtitle_offset = get_required_int (kv, N_("subtitle_offset")); + float subtitle_scale = get_required_float (kv, N_("subtitle_scale")); + string scaler_id = get_required_string (kv, N_("scaler")); + int frame = get_required_int (kv, N_("frame")); + int frames_per_second = get_required_int (kv, N_("frames_per_second")); + int colour_lut_index = get_required_int (kv, N_("colour_lut")); + int j2k_bandwidth = get_required_int (kv, N_("j2k_bandwidth")); + Position subtitle_position (get_optional_int (kv, N_("subtitle_x")), get_optional_int (kv, N_("subtitle_y"))); + libdcp::Size subtitle_size (get_optional_int (kv, N_("subtitle_width")), get_optional_int (kv, N_("subtitle_height"))); + + /* 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); - if (post_process == "none") { - post_process = ""; - } - shared_ptr image (new AlignedImage (pixel_format, in_size)); + shared_ptr image (new SimpleImage (pixel_format, in_size, true)); image->read_from_socket (socket); shared_ptr sub; - if (subtitle_position.x != -1) { - shared_ptr subtitle_image (new AlignedImage (PIX_FMT_RGBA, subtitle_size)); + if (subtitle_size.width && subtitle_size.height) { + shared_ptr subtitle_image (new SimpleImage (PIX_FMT_RGBA, subtitle_size, true)); subtitle_image->read_from_socket (socket); sub.reset (new Subtitle (subtitle_position, subtitle_image)); } 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 + scaler, frame, frames_per_second, colour_lut_index, 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; } @@ -147,7 +157,7 @@ void Server::worker_thread () { while (1) { - mutex::scoped_lock lock (_worker_mutex); + boost::mutex::scoped_lock lock (_worker_mutex); while (_queue.empty ()) { _worker_condition.wait (lock); } @@ -165,7 +175,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 (); @@ -175,7 +185,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 (); @@ -185,19 +195,19 @@ 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))); } - asio::io_service io_service; - asio::ip::tcp::acceptor acceptor (io_service, asio::ip::tcp::endpoint (asio::ip::tcp::v4(), Config::instance()->server_port ())); + boost::asio::io_service io_service; + boost::asio::ip::tcp::acceptor acceptor (io_service, boost::asio::ip::tcp::endpoint (boost::asio::ip::tcp::v4(), Config::instance()->server_port ())); while (1) { shared_ptr socket (new Socket); acceptor.accept (socket->socket ()); - mutex::scoped_lock lock (_worker_mutex); + boost::mutex::scoped_lock lock (_worker_mutex); /* Wait until the queue has gone down a bit */ while (int (_queue.size()) >= num_threads * 2) {