Use FileGroup in FFmpeg.

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

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 35ebfb52e1fc089d88383e5d0558b6719fa4f3c9..059c4014cf40b2e6be8862f1ea112854c2663096 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"
 
@@ -43,16 +46,17 @@ 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;
 
 /** @param f Film that we are encoding */
-Encoder::Encoder (shared_ptr<const Film> f, shared_ptr<Job> j)
+Encoder::Encoder (shared_ptr<const Film> f, weak_ptr<Job> j)
        : _film (f)
        , _job (j)
        , _video_frames_out (0)
-       , _state (TRANSCODING)
        , _terminate (false)
 {
        _have_a_real_frame[EYES_BOTH] = false;
@@ -68,6 +72,18 @@ 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 ()
 {
@@ -75,15 +91,8 @@ Encoder::process_begin ()
                _threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, optional<ServerDescription> ())));
        }
 
-       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)));
-               }
-       }
-
        _writer.reset (new Writer (_film, _job));
+       ServerFinder::instance()->connect (boost::bind (&Encoder::server_found, this, _1));
 }
 
 
@@ -125,11 +134,6 @@ Encoder::process_end ()
                        _film->log()->log (String::compose (N_("Local encode failed (%1)"), e.what ()));
                }
        }
-
-       {
-               boost::mutex::scoped_lock lm (_state_mutex);
-               _state = HASHING;
-       }
                
        _writer->finish ();
        _writer.reset ();
@@ -234,10 +238,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 ()) {
@@ -272,7 +277,7 @@ Encoder::encoder_thread (optional<ServerDescription> server)
 
                TIMING ("encoder thread %1 wakes with queue of %2", boost::this_thread::get_id(), _queue.size());
                shared_ptr<DCPVideoFrame> vf = _queue.front ();
-               _film->log()->log (String::compose (N_("Encoder thread %1 pops frame %2 (%3) from queue"), boost::this_thread::get_id(), vf->frame(), vf->eyes ()));
+               TIMING ("encoder thread %1 pops frame %2 (%3) from queue", boost::this_thread::get_id(), vf->frame(), vf->eyes ());
                _queue.pop_front ();
                
                lock.unlock ();
@@ -332,3 +337,9 @@ Encoder::encoder_thread (optional<ServerDescription> server)
                _condition.notify_all ();
        }
 }
+
+void
+Encoder::server_found (ServerDescription s)
+{
+       add_worker_threads (s);
+}