X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fserver.cc;h=54cffc0774b0ed1a64d6c3e3873c7d0054806843;hb=74a8d26a8907c6e00e29f054178a3425f44e38ed;hp=b5eda2eb8fa537d3d285dcd2d073d8490e34d52c;hpb=13511ed2fcc23f4d5f9c507c775c3c5cfd82d155;p=dcpomatic.git diff --git a/src/lib/server.cc b/src/lib/server.cc index b5eda2eb8..54cffc077 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" @@ -34,36 +37,51 @@ #include "dcp_video_frame.h" #include "config.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. * @return ServerDescription, or 0. */ -ServerDescription * +shared_ptr 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 shared_ptr (); } - return new ServerDescription (b[0], atoi (b[1].c_str ())); + return shared_ptr (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) { @@ -72,65 +90,43 @@ Server::Server (Log* log) int Server::process (shared_ptr socket) { - char buffer[128]; - 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); - - string command; - s >> command; - if (command != "encode") { + stringstream s (buffer.get()); + multimap kv = read_key_value (s); + + if (get_required_string (kv, "encode") != "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; - - 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; - - 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)); - - for (int i = 0; i < image->components(); ++i) { - socket->read_definite_and_consume (image->data()[i], image->stride()[i] * image->lines(i), 30); - } - /* XXX: subtitle */ + 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"); + int j2k_bandwidth = get_required_int (kv, "j2k_bandwidth"); + Eyes eyes = static_cast (get_required_int (kv, "eyes")); + + shared_ptr image (new Image (PIX_FMT_RGB24, size, true)); + + image->read_from_socket (socket); + DCPVideoFrame dcp_video_frame ( - image, shared_ptr (), out_size, padding, subtitle_offset, subtitle_scale, - scaler, frame, frames_per_second, post_process, colour_lut_index, j2k_bandwidth, _log + image, frame, eyes, 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; } @@ -138,7 +134,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); } @@ -156,7 +152,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 (); @@ -166,7 +162,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 (); @@ -176,19 +172,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) {