Merge master into direct-mxf.

[dcpomatic.git] / src / lib / server.cc

diff --git a/src/lib/server.cc b/src/lib/server.cc
index d40325db0055b7350c8bb04e8df5ca2f25a9200f..d75ab0fb679d05f894638158c8ec16db79d63153 100644 (file)
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -27,6 +27,7 @@
 #include <sstream>
 #include <iostream>
 #include <boost/algorithm/string.hpp>
+#include <boost/lexical_cast.hpp>
 #include "server.h"
 #include "util.h"
 #include "scaler.h"
@@ -35,8 +36,16 @@
 #include "config.h"
 #include "subtitle.h"
 
-using namespace std;
-using namespace boost;
+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 libdcp::Size;
 
 /** Create a server description from a string of metadata returned from as_metadata().
  *  @param v Metadata.
@@ -73,61 +82,45 @@ Server::Server (Log* log)
 int
 Server::process (shared_ptr<Socket> socket)
 {
-       char buffer[256];
+       char buffer[512];
        socket->read_indefinite ((uint8_t *) buffer, sizeof (buffer), 30);
        socket->consume (strlen (buffer) + 1);
        
        stringstream s (buffer);
+       multimap<string, string> kv = read_key_value (s);
 
-       string command;
-       s >> command;
-       if (command != "encode") {
+       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;
-       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, "input_width"), get_required_int (kv, "input_height"));
+       int pixel_format_int = get_required_int (kv, "input_pixel_format");
+       libdcp::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");
+       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"));
+       libdcp::Size subtitle_size (get_optional_int (kv, "subtitle_width"), get_optional_int (kv, "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> image (new AlignedImage (pixel_format, in_size));
+       shared_ptr<Image> image (new SimpleImage (pixel_format, in_size, true));
 
        image->read_from_socket (socket);
 
        shared_ptr<Subtitle> sub;
-       if (subtitle_position.x != -1) {
-               shared_ptr<Image> subtitle_image (new AlignedImage (PIX_FMT_RGBA, subtitle_size));
+       if (subtitle_size.width && subtitle_size.height) {
+               shared_ptr<Image> subtitle_image (new SimpleImage (PIX_FMT_RGBA, subtitle_size, true));
                subtitle_image->read_from_socket (socket);
                sub.reset (new Subtitle (subtitle_position, subtitle_image));
        }
@@ -138,7 +131,16 @@ Server::process (shared_ptr<Socket> socket)
                );
        
        shared_ptr<EncodedData> encoded = dcp_video_frame.encode_locally ();
-       encoded->send (socket);
+       try {
+               encoded->send (socket);
+       } catch (std::exception& e) {
+               _log->log (String::compose (
+                                  "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 +149,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 +167,7 @@ Server::worker_thread ()
                try {
                        frame = process (socket);
                } catch (std::exception& e) {
-                       cerr << "Error: " << e.what() << "\n";
+                       _log->log (String::compose ("Error: %1", e.what()));
                }
                
                socket.reset ();
@@ -191,13 +193,13 @@ Server::run (int num_threads)
                _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> 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) {