#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>
#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;
: _film (film)
, _job (j)
, _video_frames_enqueued (0)
+ , _left_done (false)
+ , _right_done (false)
, _terminate (false)
, _writer (writer)
{
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));
}
void
Encoder::end ()
{
- boost::mutex::scoped_lock lock (_mutex);
+ boost::mutex::scoped_lock lock (_queue_mutex);
LOG_GENERAL (N_("Clearing queue of %1"), _queue.size ());
{
_waker.nudge ();
- boost::mutex::scoped_lock lock (_mutex);
+ size_t threads = 0;
+ {
+ boost::mutex::scoped_lock threads_lock (_threads_mutex);
+ threads = _threads.size ();
+ }
+
+ boost::mutex::scoped_lock queue_lock (_queue_mutex);
/* XXX: discard 3D here if required */
/* 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());
- _full_condition.wait (lock);
- LOG_TIMING ("decoder wakes with queue of %1", _queue.size());
+ while (_queue.size() >= threads * 2 && !_terminate) {
+ LOG_TIMING ("decoder-sleep queue=%1", _queue.size());
+ _full_condition.wait (queue_lock);
+ LOG_TIMING ("decoder-wake queue=%1", _queue.size());
}
if (_terminate) {
_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,
_empty_condition.notify_all ();
}
- if (pv->eyes() != EYES_LEFT) {
+ switch (pv->eyes ()) {
+ case EYES_BOTH:
++_video_frames_enqueued;
+ break;
+ case EYES_LEFT:
+ _left_done = true;
+ break;
+ case EYES_RIGHT:
+ _right_done = true;
+ break;
+ default:
+ break;
+ }
+
+ if (_left_done && _right_done) {
+ ++_video_frames_enqueued;
+ _left_done = _right_done = false;
}
_last_player_video = pv;
Encoder::terminate_threads ()
{
{
- boost::mutex::scoped_lock lock (_mutex);
+ boost::mutex::scoped_lock queue_lock (_queue_mutex);
_terminate = true;
_full_condition.notify_all ();
_empty_condition.notify_all ();
}
+ boost::mutex::scoped_lock threads_lock (_threads_mutex);
+
for (list<boost::thread *>::iterator i = _threads.begin(); i != _threads.end(); ++i) {
if ((*i)->joinable ()) {
(*i)->join ();
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.
while (true) {
- LOG_TIMING ("[%1] encoder thread sleeps", boost::this_thread::get_id());
- boost::mutex::scoped_lock lock (_mutex);
+ LOG_TIMING ("encoder-sleep thread=%1", boost::this_thread::get_id());
+ boost::mutex::scoped_lock lock (_queue_mutex);
while (_queue.empty () && !_terminate) {
_empty_condition.wait (lock);
}
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 ();
} 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 ());
}
Encoder::servers_list_changed ()
{
terminate_threads ();
+
+ /* XXX: could re-use threads */
+
+ boost::mutex::scoped_lock lm (_threads_mutex);
+
+ 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 ());
}