Move ServerDescription into its own header.

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

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 9b195bade0bf9f36dfe81b7e4a1aec88beaf4452..b35f49a1b9460372d8cd1b458b40ad41edae8f1c 100644 (file)
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -34,8 +34,9 @@
 #include "player.h"
 #include "player_video.h"
 #include "data.h"
+#include "server_description.h"
+#include "compose.hpp"
 #include <libcxml/cxml.h>
-#include <boost/lambda/lambda.hpp>
 #include <boost/foreach.hpp>
 #include <iostream>
 
@@ -45,17 +46,11 @@
 #define LOG_ERROR(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_ERROR);
 #define LOG_TIMING(...) _film->log()->microsecond_log (String::compose (__VA_ARGS__), Log::TYPE_TIMING);
 
-using std::pair;
-using std::string;
-using std::vector;
 using std::list;
 using std::cout;
-using std::min;
-using std::make_pair;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::optional;
-using boost::scoped_array;
 
 int const Encoder::_history_size = 25;
 
@@ -77,30 +72,9 @@ Encoder::~Encoder ()
        terminate_threads ();
 }
 
-/** 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)
-{
-       LOG_GENERAL (N_("Adding %1 worker threads for remote %2"), d.threads(), d.host_name ());
-       for (int i = 0; i < d.threads(); ++i) {
-               _threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, d)));
-       }
-
-       _writer->set_encoder_threads (_threads.size ());
-}
-
 void
 Encoder::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, optional<ServerDescription> ())));
-       }
-
-       _writer->set_encoder_threads (_threads.size ());
-
        if (!ServerFinder::instance()->disabled ()) {
                _server_found_connection = ServerFinder::instance()->ServersListChanged.connect (boost::bind (&Encoder::servers_list_changed, this));
        }
@@ -204,9 +178,9 @@ Encoder::enqueue (shared_ptr<PlayerVideo> pv)
 
        /* Wait until the queue has gone down a bit */
        while (_queue.size() >= _threads.size() * 2 && !_terminate) {
-               LOG_TIMING ("decoder sleeps with queue of %1", _queue.size());
+               LOG_TIMING ("decoder-sleep queue=%1", _queue.size());
                _full_condition.wait (lock);
-               LOG_TIMING ("decoder wakes with queue of %1", _queue.size());
+               LOG_TIMING ("decoder-wake queue=%1", _queue.size());
        }
 
        if (_terminate) {
@@ -231,7 +205,7 @@ Encoder::enqueue (shared_ptr<PlayerVideo> pv)
                _writer->repeat (_video_frames_enqueued, pv->eyes ());
        } else {
                /* Queue this new frame for encoding */
-               LOG_TIMING ("adding to queue of %1", _queue.size ());
+               LOG_TIMING ("add-frame-to-queue queue=%1", _queue.size ());
                _queue.push_back (shared_ptr<DCPVideo> (
                                          new DCPVideo (
                                                  pv,
@@ -296,6 +270,12 @@ void
 Encoder::encoder_thread (optional<ServerDescription> server)
 try
 {
+       if (server) {
+               LOG_TIMING ("start-encoder-thread thread=%1 server=%2", boost::this_thread::get_id (), server->host_name ());
+       } else {
+               LOG_TIMING ("start-encoder-thread thread=%1 server=localhost", boost::this_thread::get_id ());
+       }
+
        /* Number of seconds that we currently wait between attempts
           to connect to the server; not relevant for localhost
           encodings.
@@ -304,7 +284,7 @@ try
 
        while (true) {
 
-               LOG_TIMING ("[%1] encoder thread sleeps", boost::this_thread::get_id());
+               LOG_TIMING ("encoder-sleep thread=%1", boost::this_thread::get_id());
                boost::mutex::scoped_lock lock (_mutex);
                while (_queue.empty () && !_terminate) {
                        _empty_condition.wait (lock);
@@ -314,9 +294,9 @@ try
                        return;
                }
 
-               LOG_TIMING ("[%1] encoder thread wakes with queue of %2", boost::this_thread::get_id(), _queue.size());
+               LOG_TIMING ("encoder-wake thread=%1 queue=%2", boost::this_thread::get_id(), _queue.size());
                shared_ptr<DCPVideo> vf = _queue.front ();
-               LOG_TIMING ("[%1] encoder thread pops frame %2 (%3) from queue", boost::this_thread::get_id(), vf->index(), vf->eyes ());
+               LOG_TIMING ("encoder-pop thread=%1 frame=%2 eyes=%3", boost::this_thread::get_id(), vf->index(), vf->eyes ());
                _queue.pop_front ();
 
                lock.unlock ();
@@ -348,9 +328,9 @@ try
 
                } else {
                        try {
-                               LOG_TIMING ("[%1] encoder thread begins local encode of %2", boost::this_thread::get_id(), vf->index());
+                               LOG_TIMING ("start-local-encode thread=%1 frame=%2", boost::this_thread::get_id(), vf->index());
                                encoded = vf->encode_locally (boost::bind (&Log::dcp_log, _film->log().get(), _1, _2));
-                               LOG_TIMING ("[%1] encoder thread finishes local encode of %2", boost::this_thread::get_id(), vf->index());
+                               LOG_TIMING ("finish-local-encode thread=%1 frame=%2", boost::this_thread::get_id(), vf->index());
                        } catch (std::exception& e) {
                                LOG_ERROR (N_("Local encode failed (%1)"), e.what ());
                        }
@@ -384,7 +364,21 @@ void
 Encoder::servers_list_changed ()
 {
        terminate_threads ();
+
+       /* XXX: could re-use threads */
+
+       if (!Config::instance()->only_servers_encode ()) {
+               for (int i = 0; i < Config::instance()->num_local_encoding_threads (); ++i) {
+                       _threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, optional<ServerDescription> ())));
+               }
+       }
+
        BOOST_FOREACH (ServerDescription i, ServerFinder::instance()->servers ()) {
-               add_worker_threads (i);
+               LOG_GENERAL (N_("Adding %1 worker threads for remote %2"), i.threads(), i.host_name ());
+               for (int j = 0; j < i.threads(); ++j) {
+                       _threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, i)));
+               }
        }
+
+       _writer->set_encoder_threads (_threads.size ());
 }