#include "log.h"
#include "config.h"
#include "dcp_video.h"
-#include "server.h"
#include "cross.h"
#include "writer.h"
-#include "server_finder.h"
+#include "encode_server_finder.h"
#include "player.h"
#include "player_video.h"
-#include "data.h"
-#include "server_description.h"
+#include "encode_server_description.h"
#include "compose.hpp"
#include <libcxml/cxml.h>
#include <boost/foreach.hpp>
#include "i18n.h"
-#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
-#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);
+#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
+#define LOG_GENERAL_NC(...) _film->log()->log (__VA_ARGS__, LogEntry::TYPE_GENERAL);
+#define LOG_ERROR(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_ERROR);
+#define LOG_TIMING(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_TIMING);
using std::list;
using std::cout;
using boost::shared_ptr;
using boost::weak_ptr;
using boost::optional;
+using dcp::Data;
int const Encoder::_history_size = 25;
/** @param f Film that we are encoding */
-Encoder::Encoder (shared_ptr<const Film> film, weak_ptr<Job> j, shared_ptr<Writer> writer)
+Encoder::Encoder (shared_ptr<const Film> film, shared_ptr<Writer> writer)
: _film (film)
- , _job (j)
- , _video_frames_enqueued (0)
- , _left_done (false)
- , _right_done (false)
- , _terminate (false)
+ , _position (0)
+ , _terminate_enqueue (false)
+ , _terminate_encoding (false)
, _writer (writer)
{
servers_list_changed ();
Encoder::~Encoder ()
{
terminate_threads ();
+
+ boost::mutex::scoped_lock lm (_queue_mutex);
+ _terminate_enqueue = true;
+ _full_condition.notify_all ();
+ _empty_condition.notify_all ();
}
void
Encoder::begin ()
{
- if (!ServerFinder::instance()->disabled ()) {
- _server_found_connection = ServerFinder::instance()->ServersListChanged.connect (boost::bind (&Encoder::servers_list_changed, this));
+ if (!EncodeServerFinder::instance()->disabled ()) {
+ _server_found_connection = EncodeServerFinder::instance()->ServersListChanged.connect (boost::bind (&Encoder::servers_list_changed, this));
}
}
/* Keep waking workers until the queue is empty */
while (!_queue.empty ()) {
+ rethrow ();
_empty_condition.notify_all ();
_full_condition.wait (lock);
}
lock.unlock ();
+ LOG_GENERAL_NC (N_("Terminating encoder threads"));
+
terminate_threads ();
LOG_GENERAL (N_("Mopping up %1"), _queue.size());
Encoder::video_frames_out () const
{
boost::mutex::scoped_lock (_state_mutex);
- return _video_frames_enqueued;
+ return _position;
}
/** Should be called when a frame has been encoded successfully.
}
}
-/** Called in order, so each time this is called the supplied frame is the one
- * after the previous one.
+/** Called to start encoding of the next video frame in the DCP. This is called in order,
+ * so each time the supplied frame is the one after the previous one.
+ * pv represents one video frame, and could be empty if there is nothing to encode
+ * for this DCP frame.
*/
+void
+Encoder::encode (list<shared_ptr<PlayerVideo> > pv)
+{
+ BOOST_FOREACH (shared_ptr<PlayerVideo> i, pv) {
+ enqueue (i);
+ }
+ ++_position;
+}
+
void
Encoder::enqueue (shared_ptr<PlayerVideo> pv)
{
/* XXX: discard 3D here if required */
/* Wait until the queue has gone down a bit */
- while (_queue.size() >= threads * 2 && !_terminate) {
+ while (_queue.size() >= threads * 2 && !_terminate_enqueue) {
LOG_TIMING ("decoder-sleep queue=%1", _queue.size());
_full_condition.wait (queue_lock);
LOG_TIMING ("decoder-wake queue=%1", _queue.size());
}
- if (_terminate) {
+ if (_terminate_enqueue) {
return;
}
*/
rethrow ();
- if (_writer->can_fake_write (_video_frames_enqueued)) {
+ if (_writer->can_fake_write (_position)) {
/* We can fake-write this frame */
- _writer->fake_write (_video_frames_enqueued, pv->eyes ());
+ _writer->fake_write (_position, 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 ());
+ _writer->write (pv->j2k(), _position, pv->eyes ());
+ } else if (_last_player_video && _writer->can_repeat(_position) && pv->same (_last_player_video)) {
+ _writer->repeat (_position, pv->eyes ());
} else {
/* Queue this new frame for encoding */
LOG_TIMING ("add-frame-to-queue queue=%1", _queue.size ());
_queue.push_back (shared_ptr<DCPVideo> (
new DCPVideo (
pv,
- _video_frames_enqueued,
+ _position,
_film->video_frame_rate(),
_film->j2k_bandwidth(),
_film->resolution(),
_empty_condition.notify_all ();
}
- 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;
}
{
{
boost::mutex::scoped_lock queue_lock (_queue_mutex);
- _terminate = true;
- _full_condition.notify_all ();
- _empty_condition.notify_all ();
+ _terminate_encoding = true;
}
boost::mutex::scoped_lock threads_lock (_threads_mutex);
+ int n = 0;
for (list<boost::thread *>::iterator i = _threads.begin(); i != _threads.end(); ++i) {
+ LOG_GENERAL ("Terminating thread %1 of %2", n + 1, _threads.size ());
+ (*i)->interrupt ();
if ((*i)->joinable ()) {
(*i)->join ();
}
delete *i;
+ LOG_GENERAL_NC ("Thread terminated");
+ ++n;
}
_threads.clear ();
- _terminate = false;
+ _terminate_encoding = false;
}
void
-Encoder::encoder_thread (optional<ServerDescription> server)
+Encoder::encoder_thread (optional<EncodeServerDescription> server)
try
{
if (server) {
LOG_TIMING ("encoder-sleep thread=%1", boost::this_thread::get_id());
boost::mutex::scoped_lock lock (_queue_mutex);
- while (_queue.empty () && !_terminate) {
+ while (_queue.empty () && !_terminate_encoding) {
_empty_condition.wait (lock);
}
- if (_terminate) {
+ if (_terminate_encoding) {
return;
}
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 ());
+ throw;
}
}
}
if (remote_backoff > 0) {
- dcpomatic_sleep (remote_backoff);
+ boost::this_thread::sleep (boost::posix_time::seconds (remote_backoff));
}
/* The queue might not be full any more, so notify anything that is waiting on that */
catch (...)
{
store_current ();
+ /* Wake anything waiting on _full_condition so it can see the exception */
+ _full_condition.notify_all ();
}
void
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> ())));
+ _threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, optional<EncodeServerDescription> ())));
}
}
- BOOST_FOREACH (ServerDescription i, ServerFinder::instance()->servers ()) {
+ BOOST_FOREACH (EncodeServerDescription i, EncodeServerFinder::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)));
projects / dcpomatic.git / blobdiff