Merge master.

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

diff --git a/src/lib/server.cc b/src/lib/server.cc
index bad7ad89310d95ccb8619488e13ae873771de31f..d72b7e5025b84e57513a97864014137d5658eacd 100644 (file)
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -27,9 +27,9 @@
 #include <sstream>
 #include <iostream>
 #include <boost/algorithm/string.hpp>
-#include <boost/lexical_cast.hpp>
 #include <boost/scoped_array.hpp>
 #include <libcxml/cxml.h>
+#include <dcp/raw_convert.h>
 #include "server.h"
 #include "util.h"
 #include "scaler.h"
@@ -37,6 +37,7 @@
 #include "dcp_video_frame.h"
 #include "config.h"
 #include "cross.h"
+#include "player_video_frame.h"
 
 #include "i18n.h"
 
@@ -56,38 +57,8 @@ using boost::thread;
 using boost::bind;
 using boost::scoped_array;
 using boost::optional;
-using boost::lexical_cast;
-using libdcp::Size;
-
-ServerDescription::ServerDescription (shared_ptr<const cxml::Node> node)
-{
-       _host_name = node->string_child ("HostName");
-       _threads = node->number_child<int> ("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<string> (_threads));
-}
-
-/** Create a server description from a string of metadata returned from as_metadata().
- *  @param v Metadata.
- *  @return ServerDescription, or 0.
- */
-optional<ServerDescription>
-ServerDescription::create_from_metadata (string v)
-{
-       vector<string> b;
-       split (b, v, is_any_of (" "));
-
-       if (b.size() != 2) {
-               return optional<ServerDescription> ();
-       }
-
-       return ServerDescription (b[0], atoi (b[1].c_str ()));
-}
+using dcp::Size;
+using dcp::raw_convert;
 
 Server::Server (shared_ptr<Log> log, bool verbose)
        : _log (log)
@@ -105,7 +76,7 @@ Server::process (shared_ptr<Socket> socket, struct timeval& after_read, struct t
        uint32_t length = socket->read_uint32 ();
        scoped_array<char> buffer (new char[length]);
        socket->read (reinterpret_cast<uint8_t*> (buffer.get()), length);
-       
+
        stringstream s (buffer.get());
        shared_ptr<cxml::Document> xml (new cxml::Document ("EncodingRequest"));
        xml->read_stream (s);
@@ -115,14 +86,9 @@ Server::process (shared_ptr<Socket> socket, struct timeval& after_read, struct t
                return -1;
        }
 
-       libdcp::Size size (
-               xml->number_child<int> ("Width"), xml->number_child<int> ("Height")
-               );
-
-       shared_ptr<Image> image (new Image (PIX_FMT_RGB24, size, true));
+       shared_ptr<PlayerVideoFrame> pvf (new PlayerVideoFrame (xml, socket));
 
-       image->read_from_socket (socket);
-       DCPVideoFrame dcp_video_frame (image, xml, _log);
+       DCPVideoFrame dcp_video_frame (pvf, xml, _log);
 
        gettimeofday (&after_read, 0);
        
@@ -133,15 +99,11 @@ Server::process (shared_ptr<Socket> socket, struct timeval& after_read, struct t
        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",
-                                  dcp_video_frame.frame(), encoded->size(), image->pixel_format(), image->size().width, image->size().height, image->components()
-                                  )
-                       );
+               _log->log (String::compose ("Send failed; frame %1", dcp_video_frame.index()));
                throw;
        }
 
-       return dcp_video_frame.frame ();
+       return dcp_video_frame.index ();
 }
 
 void
@@ -209,7 +171,7 @@ Server::run (int 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";
+               cout << "DCP-o-matic server starting with " << num_threads << " threads.\n";
        }
        
        for (int i = 0; i < num_threads; ++i) {
@@ -243,6 +205,7 @@ Server::run (int num_threads)
 
 void
 Server::broadcast_thread ()
+try
 {
        boost::asio::io_service io_service;
 
@@ -261,6 +224,10 @@ Server::broadcast_thread ()
 
        io_service.run ();
 }
+catch (...)
+{
+       store_current ();
+}
 
 void
 Server::broadcast_received ()
@@ -271,7 +238,7 @@ Server::broadcast_received ()
                /* 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<string> (_worker_threads.size ()));
+               root->add_child("Threads")->add_child_text (raw_convert<string> (_worker_threads.size ()));
                stringstream xml;
                doc.write_to_stream (xml, "UTF-8");