/*
- Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
* @brief Parent class for classes which can encode video and audio frames.
*/
-#include <iostream>
-#include <boost/lambda/lambda.hpp>
-#include <libcxml/cxml.h>
#include "encoder.h"
#include "util.h"
#include "film.h"
#include "log.h"
#include "config.h"
-#include "dcp_video_frame.h"
+#include "dcp_video.h"
#include "server.h"
#include "cross.h"
#include "writer.h"
#include "server_finder.h"
#include "player.h"
-#include "player_video_frame.h"
+#include "player_video.h"
+#include "data.h"
+#include "server_description.h"
+#include "compose.hpp"
+#include <libcxml/cxml.h>
+#include <boost/foreach.hpp>
+#include <iostream>
#include "i18n.h"
#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::stringstream;
-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;
/** @param f Film that we are encoding */
-Encoder::Encoder (shared_ptr<const Film> f, weak_ptr<Job> j)
- : _film (f)
+Encoder::Encoder (shared_ptr<const Film> film, weak_ptr<Job> j, shared_ptr<Writer> writer)
+ : _film (film)
, _job (j)
- , _video_frames_out (0)
+ , _video_frames_enqueued (0)
+ , _left_done (false)
+ , _right_done (false)
, _terminate (false)
+ , _writer (writer)
{
-
+ servers_list_changed ();
}
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.host_name ());
- 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 ()
+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> ())));
+ if (!ServerFinder::instance()->disabled ()) {
+ _server_found_connection = ServerFinder::instance()->ServersListChanged.connect (boost::bind (&Encoder::servers_list_changed, this));
}
-
- _writer.reset (new Writer (_film, _job));
- ServerFinder::instance()->connect (boost::bind (&Encoder::server_found, this, _1));
}
void
-Encoder::process_end ()
+Encoder::end ()
{
- boost::mutex::scoped_lock lock (_mutex);
+ boost::mutex::scoped_lock lock (_queue_mutex);
LOG_GENERAL (N_("Clearing queue of %1"), _queue.size ());
/* Keep waking workers until the queue is empty */
while (!_queue.empty ()) {
- _condition.notify_all ();
- _condition.wait (lock);
+ _empty_condition.notify_all ();
+ _full_condition.wait (lock);
}
lock.unlock ();
-
+
terminate_threads ();
LOG_GENERAL (N_("Mopping up %1"), _queue.size());
So just mop up anything left in the queue here.
*/
- for (list<shared_ptr<DCPVideoFrame> >::iterator i = _queue.begin(); i != _queue.end(); ++i) {
+ for (list<shared_ptr<DCPVideo> >::iterator i = _queue.begin(); i != _queue.end(); ++i) {
LOG_GENERAL (N_("Encode left-over frame %1"), (*i)->index ());
try {
- _writer->write ((*i)->encode_locally(), (*i)->index (), (*i)->eyes ());
+ _writer->write (
+ (*i)->encode_locally (boost::bind (&Log::dcp_log, _film->log().get(), _1, _2)),
+ (*i)->index (),
+ (*i)->eyes ()
+ );
frame_done ();
} catch (std::exception& e) {
LOG_ERROR (N_("Local encode failed (%1)"), e.what ());
}
}
-
- _writer->finish ();
- _writer.reset ();
-}
+}
/** @return an estimate of the current number of frames we are encoding per second,
* or 0 if not known.
Encoder::video_frames_out () const
{
boost::mutex::scoped_lock (_state_mutex);
- return _video_frames_out;
+ return _video_frames_enqueued;
}
/** Should be called when a frame has been encoded successfully.
Encoder::frame_done ()
{
boost::mutex::scoped_lock lock (_state_mutex);
-
+
struct timeval tv;
gettimeofday (&tv, 0);
_time_history.push_front (tv);
}
}
+/** Called in order, so each time this is called the supplied frame is the one
+ * after the previous one.
+ */
void
-Encoder::process_video (shared_ptr<PlayerVideoFrame> pvf)
+Encoder::enqueue (shared_ptr<PlayerVideo> pv)
{
_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());
- _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) {
*/
rethrow ();
- if (_writer->can_fake_write (_video_frames_out)) {
- _writer->fake_write (_video_frames_out, pvf->eyes ());
+ if (_writer->can_fake_write (_video_frames_enqueued)) {
+ /* We can fake-write this frame */
+ _writer->fake_write (_video_frames_enqueued, pv->eyes ());
frame_done ();
+ } else if (pv->has_j2k ()) {
+ /* This frame already has JPEG2000 data, so just write it */
+ _writer->write (pv->j2k(), _video_frames_enqueued, pv->eyes ());
+ } else if (_last_player_video && pv->same (_last_player_video)) {
+ _writer->repeat (_video_frames_enqueued, pv->eyes ());
} else {
/* Queue this new frame for encoding */
- LOG_TIMING ("adding to queue of %1", _queue.size ());
- _queue.push_back (shared_ptr<DCPVideoFrame> (
- new DCPVideoFrame (
- pvf,
- _video_frames_out,
+ LOG_TIMING ("add-frame-to-queue queue=%1", _queue.size ());
+ _queue.push_back (shared_ptr<DCPVideo> (
+ new DCPVideo (
+ pv,
+ _video_frames_enqueued,
_film->video_frame_rate(),
_film->j2k_bandwidth(),
_film->resolution(),
_film->log()
)
));
-
- _condition.notify_all ();
+
+ /* The queue might not be empty any more, so notify anything which is
+ waiting on that.
+ */
+ _empty_condition.notify_all ();
}
- if (pvf->eyes() != EYES_LEFT) {
- ++_video_frames_out;
+ 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;
}
-}
-void
-Encoder::process_audio (shared_ptr<const AudioBuffers> data)
-{
- _writer->write (data);
+ if (_left_done && _right_done) {
+ ++_video_frames_enqueued;
+ _left_done = _right_done = false;
+ }
+
+ _last_player_video = pv;
}
void
Encoder::terminate_threads ()
{
{
- boost::mutex::scoped_lock lock (_mutex);
+ boost::mutex::scoped_lock queue_lock (_queue_mutex);
_terminate = true;
- _condition.notify_all ();
+ _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 ();
}
_threads.clear ();
+ _terminate = false;
}
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.
*/
int remote_backoff = 0;
-
- while (1) {
- LOG_TIMING ("[%1] encoder thread sleeps", boost::this_thread::get_id());
- boost::mutex::scoped_lock lock (_mutex);
+ while (true) {
+
+ LOG_TIMING ("encoder-sleep thread=%1", boost::this_thread::get_id());
+ boost::mutex::scoped_lock lock (_queue_mutex);
while (_queue.empty () && !_terminate) {
- _condition.wait (lock);
+ _empty_condition.wait (lock);
}
if (_terminate) {
return;
}
- LOG_TIMING ("[%1] encoder thread wakes with queue of %2", boost::this_thread::get_id(), _queue.size());
- shared_ptr<DCPVideoFrame> 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-wake thread=%1 queue=%2", boost::this_thread::get_id(), _queue.size());
+ shared_ptr<DCPVideo> vf = _queue.front ();
+ LOG_TIMING ("encoder-pop thread=%1 frame=%2 eyes=%3", boost::this_thread::get_id(), vf->index(), vf->eyes ());
_queue.pop_front ();
-
+
lock.unlock ();
- shared_ptr<EncodedData> encoded;
+ optional<Data> encoded;
+ /* We need to encode this input */
if (server) {
try {
encoded = vf->encode_remotely (server.get ());
if (remote_backoff > 0) {
LOG_GENERAL ("%1 was lost, but now she is found; removing backoff", server->host_name ());
}
-
+
/* This job succeeded, so remove any backoff */
remote_backoff = 0;
-
+
} catch (std::exception& e) {
if (remote_backoff < 60) {
/* back off more */
vf->index(), server->host_name(), e.what(), remote_backoff
);
}
-
+
} else {
try {
- LOG_TIMING ("[%1] encoder thread begins local encode of %2", boost::this_thread::get_id(), vf->index());
- encoded = vf->encode_locally ();
- LOG_TIMING ("[%1] encoder thread finishes 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 ("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 ());
}
}
if (encoded) {
- _writer->write (encoded, vf->index (), vf->eyes ());
+ _writer->write (encoded.get(), vf->index (), vf->eyes ());
frame_done ();
} else {
lock.lock ();
dcpomatic_sleep (remote_backoff);
}
+ /* The queue might not be full any more, so notify anything that is waiting on that */
lock.lock ();
- _condition.notify_all ();
+ _full_condition.notify_all ();
}
}
catch (...)
}
void
-Encoder::server_found (ServerDescription s)
+Encoder::servers_list_changed ()
{
- add_worker_threads (s);
+ 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 ()) {
+ 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 ());
}