#include "server.h"
#include "cross.h"
#include "writer.h"
+#include "server_finder.h"
+#include "player.h"
#include "i18n.h"
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)
, _terminate (false)
- , _broadcast_thread (0)
- , _listen_thread (0)
{
_have_a_real_frame[EYES_BOTH] = false;
_have_a_real_frame[EYES_LEFT] = false;
}
}
-/** Add a worker thread for a remote server. Caller must hold
+/** 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_thread (ServerDescription d)
+Encoder::add_worker_threads (ServerDescription d)
{
- _threads.push_back (
- make_pair (d, new boost::thread (boost::bind (&Encoder::encoder_thread, this, 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 (
- make_pair (
- optional<ServerDescription> (),
- 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) {
- add_worker_thread (*i);
- }
+ _threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, optional<ServerDescription> ())));
}
- _broadcast_thread = new boost::thread (boost::bind (&Encoder::broadcast_thread, this));
- _listen_thread = new boost::thread (boost::bind (&Encoder::listen_thread, this));
-
_writer.reset (new Writer (_film, _job));
+ ServerFinder::instance()->connect (boost::bind (&Encoder::server_found, this, _1));
}
-
void
Encoder::process_end ()
{
}
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);
return;
}
- if (_writer->thrown ()) {
- _writer->rethrow ();
- }
+ _writer->rethrow ();
+ /* Re-throw any exception raised by one of our threads. If more
+ than one has thrown an exception, only one will be rethrown, I think;
+ but then, if that happens something has gone badly wrong.
+ */
+ rethrow ();
if (_writer->can_fake_write (_video_frames_out)) {
_writer->fake_write (_video_frames_out, eyes);
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()
)
));
_condition.notify_all ();
}
- for (ThreadList::iterator i = _threads.begin(); i != _threads.end(); ++i) {
- if (i->second->joinable ()) {
- i->second->join ();
+ for (list<boost::thread *>::iterator i = _threads.begin(); i != _threads.end(); ++i) {
+ if ((*i)->joinable ()) {
+ (*i)->join ();
}
- delete i->second;
+ delete *i;
}
_threads.clear ();
-
- if (_broadcast_thread && _broadcast_thread->joinable ()) {
- _broadcast_thread->join ();
- }
- delete _broadcast_thread;
-
- if (_listen_thread && _listen_thread->joinable ()) {
- _listen_thread->join ();
- }
- delete _listen_thread;
}
void
Encoder::encoder_thread (optional<ServerDescription> server)
+try
{
/* Number of seconds that we currently wait between attempts
to connect to the server; not relevant for localhost
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 ();
_condition.notify_all ();
}
}
-
-void
-Encoder::broadcast_thread ()
+catch (...)
{
- boost::system::error_code error;
- boost::asio::io_service io_service;
- boost::asio::ip::udp::socket socket (io_service);
- socket.open (boost::asio::ip::udp::v4(), error);
- if (error) {
- throw NetworkError ("failed to set up broadcast socket");
- }
-
- socket.set_option (boost::asio::ip::udp::socket::reuse_address (true));
- socket.set_option (boost::asio::socket_base::broadcast (true));
-
- boost::asio::ip::udp::endpoint end_point (boost::asio::ip::address_v4::broadcast(), Config::instance()->server_port_base() + 1);
-
- while (1) {
- boost::mutex::scoped_lock lm (_mutex);
- if (_terminate) {
- socket.close (error);
- return;
- }
-
- string data = DCPOMATIC_HELLO;
- socket.send_to (boost::asio::buffer (data.c_str(), data.size() + 1), end_point);
-
- lm.unlock ();
- dcpomatic_sleep (10);
- }
+ store_current ();
}
void
-Encoder::listen_thread ()
+Encoder::server_found (ServerDescription s)
{
- while (1) {
- {
- /* See if we need to stop */
- boost::mutex::scoped_lock lm (_mutex);
- if (_terminate) {
- return;
- }
- }
-
- shared_ptr<Socket> sock (new Socket (10));
-
- try {
- sock->accept (Config::instance()->server_port_base() + 1);
- } catch (std::exception& e) {
- continue;
- }
-
- uint32_t length = sock->read_uint32 ();
- scoped_array<char> buffer (new char[length]);
- sock->read (reinterpret_cast<uint8_t*> (buffer.get()), length);
-
- stringstream s (buffer.get());
- shared_ptr<cxml::Document> xml (new cxml::Document ("ServerAvailable"));
- xml->read_stream (s);
-
- {
- /* See if we already know about this server */
- string const ip = sock->socket().remote_endpoint().address().to_string ();
- boost::mutex::scoped_lock lm (_mutex);
- ThreadList::iterator i = _threads.begin();
- while (i != _threads.end() && (!i->first || i->first->host_name() != ip)) {
- ++i;
- }
-
- if (i == _threads.end ()) {
- cout << "Adding a thread for " << ip << "\n";
- add_worker_thread (ServerDescription (ip, xml->number_child<int> ("Threads")));
- } else {
- cout << "Already know about " << ip << "\n";
- }
- }
- }
+ add_worker_threads (s);
}
projects / dcpomatic.git / blobdiff