X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fserver.cc;h=ff77f8e8feba3e6d70161cf61c4f297f884196ba;hb=2fabfde079641001d0968ca2fee8e70a0b929e27;hp=ca0bec580b62a4412c77e33677814153c9b8a378;hpb=e94cd129dcd66a76210880bfdf19d27f7992651b;p=dcpomatic.git diff --git a/src/lib/server.cc b/src/lib/server.cc index ca0bec580..ff77f8e8f 100644 --- a/src/lib/server.cc +++ b/src/lib/server.cc @@ -36,7 +36,7 @@ #include "image.h" #include "dcp_video_frame.h" #include "config.h" -#include "subtitle.h" +#include "cross.h" #include "i18n.h" @@ -44,12 +44,17 @@ using std::string; using std::stringstream; using std::multimap; using std::vector; +using std::list; +using std::cout; +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 boost::lexical_cast; using libdcp::Size; ServerDescription::ServerDescription (shared_ptr node) @@ -69,21 +74,22 @@ ServerDescription::as_xml (xmlpp::Node* root) const * @param v Metadata. * @return ServerDescription, or 0. */ -ServerDescription * +optional ServerDescription::create_from_metadata (string v) { vector b; - split (b, v, is_any_of (N_(" "))); + split (b, v, is_any_of (" ")); 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 ())); } -Server::Server (shared_ptr log) +Server::Server (shared_ptr log, bool verbose) : _log (log) + , _verbose (verbose) { } @@ -96,62 +102,36 @@ Server::process (shared_ptr socket) socket->read (reinterpret_cast (buffer.get()), length); stringstream s (buffer.get()); - multimap kv = read_key_value (s); - - if (get_required_string (kv, N_("encode")) != N_("please")) { + shared_ptr xml (new cxml::Document ("EncodingRequest")); + xml->read_stream (s); + if (xml->number_child ("Version") != SERVER_LINK_VERSION) { + cerr << "Mismatched server/client versions\n"; + _log->log ("Mismatched server/client versions"); return -1; } - 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")); - string post_process = get_optional_string (kv, N_("post_process")); - 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); - - shared_ptr image (new SimpleImage (pixel_format, in_size, true)); - - image->read_from_socket (socket); + libdcp::Size size ( + xml->number_child ("Width"), xml->number_child ("Height") + ); - shared_ptr sub; - 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)); - } + shared_ptr image (new Image (PIX_FMT_RGB24, size, true)); - 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->read_from_socket (socket); + DCPVideoFrame dcp_video_frame (image, xml, _log); shared_ptr encoded = dcp_video_frame.encode_locally (); 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() + "Send failed; frame %1, data size %2, pixel format %3, image size %4x%5, %6 components", + dcp_video_frame.frame(), encoded->size(), image->pixel_format(), image->size().width, image->size().height, image->components() ) ); throw; } - return frame; + return dcp_video_frame.frame (); } void @@ -176,7 +156,7 @@ Server::worker_thread () try { frame = process (socket); } catch (std::exception& e) { - _log->log (String::compose (N_("Error: %1"), e.what())); + _log->log (String::compose ("Error: %1", e.what())); } socket.reset (); @@ -186,7 +166,16 @@ Server::worker_thread () if (frame >= 0) { struct timeval end; gettimeofday (&end, 0); - _log->log (String::compose (N_("Encoded frame %1 in %2"), frame, seconds (end) - seconds (start))); + + string const message = String::compose ( + "Encoded frame %1 from %2 in %3s", frame, socket->socket().remote_endpoint().address().to_string(), seconds(end) - seconds(start) + ); + + if (_verbose) { + cout << message << "\n"; + } + + _log->log (message); } _worker_condition.notify_all (); @@ -196,14 +185,24 @@ Server::worker_thread () void Server::run (int num_threads) { - _log->log (String::compose (N_("Server starting with %1 threads"), num_threads)); + _log->log (String::compose ("Server starting with %1 threads", num_threads)); + if (_verbose) { + cout << "DCP-o-matic server started with " << num_threads << " threads.\n"; + } for (int i = 0; i < num_threads; ++i) { _worker_threads.push_back (new thread (bind (&Server::worker_thread, this))); } + _broadcast.thread = new thread (bind (&Server::broadcast_thread, this)); + 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 ())); + + boost::asio::ip::tcp::acceptor acceptor ( + io_service, + boost::asio::ip::tcp::endpoint (boost::asio::ip::tcp::v4(), Config::instance()->server_port_base ()) + ); + while (1) { shared_ptr socket (new Socket); acceptor.accept (socket->socket ()); @@ -219,3 +218,53 @@ Server::run (int num_threads) _worker_condition.notify_all (); } } + +void +Server::broadcast_thread () +{ + boost::asio::io_service io_service; + + boost::asio::ip::address address = boost::asio::ip::address_v4::any (); + boost::asio::ip::udp::endpoint listen_endpoint (address, Config::instance()->server_port_base() + 1); + + _broadcast.socket = new boost::asio::ip::udp::socket (io_service); + _broadcast.socket->open (listen_endpoint.protocol ()); + _broadcast.socket->bind (listen_endpoint); + + _broadcast.socket->async_receive_from ( + boost::asio::buffer (_broadcast.buffer, sizeof (_broadcast.buffer)), + _broadcast.send_endpoint, + boost::bind (&Server::broadcast_received, this) + ); + + io_service.run (); +} + +void +Server::broadcast_received () +{ + _broadcast.buffer[sizeof(_broadcast.buffer) - 1] = '\0'; + + if (strcmp (_broadcast.buffer, DCPOMATIC_HELLO) == 0) { + /* Reply to the client saying what we can do */ + xmlpp::Document doc; + xmlpp::Element* root = doc.create_root_node ("ServerAvailable"); + root->add_child("Threads")->add_child_text (lexical_cast (_worker_threads.size ())); + stringstream xml; + doc.write_to_stream (xml, "UTF-8"); + + shared_ptr socket (new Socket); + try { + socket->connect (boost::asio::ip::tcp::endpoint (_broadcast.send_endpoint.address(), Config::instance()->server_port_base() + 1)); + socket->write (xml.str().length() + 1); + socket->write ((uint8_t *) xml.str().c_str(), xml.str().length() + 1); + } catch (...) { + + } + } + + _broadcast.socket->async_receive_from ( + boost::asio::buffer (_broadcast.buffer, sizeof (_broadcast.buffer)), + _broadcast.send_endpoint, boost::bind (&Server::broadcast_received, this) + ); +}