X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencoder.cc;h=475c230da5ac1f3ba4458afd6cb55d062810e365;hb=b8fb440b93ff5ee835249204bd5642cf95a4ac99;hp=35ebfb52e1fc089d88383e5d0558b6719fa4f3c9;hpb=373f010a7f04add1f49169cbaa60cb7ae5f508d4;p=dcpomatic.git

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 35ebfb52e..475c230da 100644
--- 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,8 @@
 #include "server.h"
 #include "cross.h"
 #include "writer.h"
+#include "server_finder.h"
+#include "player.h"
 
 #include "i18n.h"
 
@@ -43,16 +47,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 +73,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 +92,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 +135,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 ();
@@ -177,7 +182,7 @@ Encoder::frame_done ()
 }
 
 void
-Encoder::process_video (shared_ptr<const Image> image, Eyes eyes, ColourConversion conversion, bool same)
+Encoder::process_video (shared_ptr<PlayerImage> image, Eyes eyes, ColourConversion conversion, bool same)
 {
 	boost::mutex::scoped_lock lock (_mutex);
 
@@ -211,8 +216,8 @@ Encoder::process_video (shared_ptr<const Image> image, Eyes eyes, ColourConversi
 		TIMING ("adding to queue of %1", _queue.size ());
 		_queue.push_back (shared_ptr<DCPVideoFrame> (
 					  new DCPVideoFrame (
-						  image, _video_frames_out, eyes, conversion, _film->video_frame_rate(),
-						  _film->j2k_bandwidth(), _film->log()
+						  image->image(PIX_FMT_RGB24, false), _video_frames_out, eyes, conversion, _film->video_frame_rate(),
+						  _film->j2k_bandwidth(), _film->resolution(), _film->log()
 						  )
 					  ));
 		
@@ -234,10 +239,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 +278,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 +338,9 @@ Encoder::encoder_thread (optional<ServerDescription> server)
 		_condition.notify_all ();
 	}
 }
+
+void
+Encoder::server_found (ServerDescription s)
+{
+	add_worker_threads (s);
+}