Various bits of server tidying up.

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

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 0c7434220812551e44ef8e4c72601e692538f603..ccaeab18c6ad0f6b9226ecb519421610b5b6c908 100644 (file)
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -22,6 +22,8 @@
  */
 
 #include <iostream>
+#include <boost/lambda/lambda.hpp>
+#include <libcxml/cxml.h>
 #include "encoder.h"
 #include "util.h"
 #include "film.h"
@@ -31,6 +33,7 @@
 #include "server.h"
 #include "cross.h"
 #include "writer.h"
+#include "server_finder.h"
 
 #include "i18n.h"
 
@@ -44,6 +47,7 @@ using std::min;
 using std::make_pair;
 using boost::shared_ptr;
 using boost::optional;
+using boost::scoped_array;
 
 int const Encoder::_history_size = 25;
 
@@ -67,22 +71,33 @@ Encoder::~Encoder ()
        }
 }
 
+/** Add a worker thread for a each thread on a remote server.  Caller must hold
+ *  a lock on _mutex, or know that one is not currently required to
+ *  safely modify _threads.
+ */
+void
+Encoder::add_worker_threads (ServerDescription d)
+{
+       for (int i = 0; i < d.threads(); ++i) {
+               _threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, d)));
+       }
+}
+
 void
 Encoder::process_begin ()
 {
        for (int i = 0; i < Config::instance()->num_local_encoding_threads (); ++i) {
-               _threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, (ServerDescription *) 0)));
+               _threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, optional<ServerDescription> ())));
        }
 
-       vector<ServerDescription*> servers = Config::instance()->servers ();
+       vector<ServerDescription> servers = Config::instance()->servers ();
 
-       for (vector<ServerDescription*>::iterator i = servers.begin(); i != servers.end(); ++i) {
-               for (int j = 0; j < (*i)->threads (); ++j) {
-                       _threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, *i)));
-               }
+       for (vector<ServerDescription>::iterator i = servers.begin(); i != servers.end(); ++i) {
+               add_worker_threads (*i);
        }
 
        _writer.reset (new Writer (_film, _job));
+       ServerFinder::instance()->connect (boost::bind (&Encoder::server_found, this, _1));
 }
 
 
@@ -124,7 +139,7 @@ Encoder::process_end ()
                        _film->log()->log (String::compose (N_("Local encode failed (%1)"), e.what ()));
                }
        }
-
+               
        _writer->finish ();
        _writer.reset ();
 }      
@@ -135,7 +150,7 @@ Encoder::process_end ()
 float
 Encoder::current_encoding_rate () const
 {
-       boost::mutex::scoped_lock lock (_history_mutex);
+       boost::mutex::scoped_lock lock (_state_mutex);
        if (int (_time_history.size()) < _history_size) {
                return 0;
        }
@@ -150,7 +165,7 @@ Encoder::current_encoding_rate () const
 int
 Encoder::video_frames_out () const
 {
-       boost::mutex::scoped_lock (_history_mutex);
+       boost::mutex::scoped_lock (_state_mutex);
        return _video_frames_out;
 }
 
@@ -160,7 +175,7 @@ Encoder::video_frames_out () const
 void
 Encoder::frame_done ()
 {
-       boost::mutex::scoped_lock lock (_history_mutex);
+       boost::mutex::scoped_lock lock (_state_mutex);
        
        struct timeval tv;
        gettimeofday (&tv, 0);
@@ -171,7 +186,7 @@ Encoder::frame_done ()
 }
 
 void
-Encoder::process_video (shared_ptr<const Image> image, Eyes eyes, bool same)
+Encoder::process_video (shared_ptr<const Image> image, Eyes eyes, ColourConversion conversion, bool same)
 {
        boost::mutex::scoped_lock lock (_mutex);
 
@@ -205,7 +220,7 @@ Encoder::process_video (shared_ptr<const Image> image, Eyes eyes, bool same)
                TIMING ("adding to queue of %1", _queue.size ());
                _queue.push_back (shared_ptr<DCPVideoFrame> (
                                          new DCPVideoFrame (
-                                                 image, _video_frames_out, eyes, _film->video_frame_rate(),
+                                                 image, _video_frames_out, eyes, conversion, _film->video_frame_rate(),
                                                  _film->j2k_bandwidth(), _film->log()
                                                  )
                                          ));
@@ -228,10 +243,11 @@ Encoder::process_audio (shared_ptr<const AudioBuffers> data)
 void
 Encoder::terminate_threads ()
 {
-       boost::mutex::scoped_lock lock (_mutex);
-       _terminate = true;
-       _condition.notify_all ();
-       lock.unlock ();
+       {
+               boost::mutex::scoped_lock lock (_mutex);
+               _terminate = true;
+               _condition.notify_all ();
+       }
 
        for (list<boost::thread *>::iterator i = _threads.begin(); i != _threads.end(); ++i) {
                if ((*i)->joinable ()) {
@@ -244,7 +260,7 @@ Encoder::terminate_threads ()
 }
 
 void
-Encoder::encoder_thread (ServerDescription* server)
+Encoder::encoder_thread (optional<ServerDescription> server)
 {
        /* Number of seconds that we currently wait between attempts
           to connect to the server; not relevant for localhost
@@ -275,7 +291,7 @@ Encoder::encoder_thread (ServerDescription* server)
 
                if (server) {
                        try {
-                               encoded = vf->encode_remotely (server);
+                               encoded = vf->encode_remotely (server.get ());
 
                                if (remote_backoff > 0) {
                                        _film->log()->log (String::compose (N_("%1 was lost, but now she is found; removing backoff"), server->host_name ()));
@@ -326,3 +342,9 @@ Encoder::encoder_thread (ServerDescription* server)
                _condition.notify_all ();
        }
 }
+
+void
+Encoder::server_found (ServerDescription s)
+{
+       add_worker_threads (s);
+}