/*
Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ DCP-o-matic is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
#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 "server_description.h"
+#include "encode_server_description.h"
#include "compose.hpp"
#include <libcxml/cxml.h>
#include <boost/foreach.hpp>
using boost::optional;
using dcp::Data;
-int const Encoder::_history_size = 25;
+int const Encoder::_history_size = 200;
/** @param f Film that we are encoding */
Encoder::Encoder (shared_ptr<const Film> film, shared_ptr<Writer> writer)
: _film (film)
- , _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 ();
+ try {
+ terminate_threads ();
+ } catch (...) {
+ /* Destructors must not throw exceptions; anything bad
+ happening now is too late to worry about anyway,
+ I think.
+ */
+ }
}
void
Encoder::begin ()
{
- if (!ServerFinder::instance()->disabled ()) {
- _server_found_connection = ServerFinder::instance()->ServersListChanged.connect (boost::bind (&Encoder::servers_list_changed, this));
+ weak_ptr<Encoder> wp = shared_from_this ();
+ _server_found_connection = EncodeServerFinder::instance()->ServersListChanged.connect (
+ boost::bind (&Encoder::call_servers_list_changed, wp)
+ );
+}
+
+/* We don't want the servers-list-changed callback trying to do things
+ during destruction of Encoder, and I think this is the neatest way
+ to achieve that.
+*/
+void
+Encoder::call_servers_list_changed (weak_ptr<Encoder> encoder)
+{
+ shared_ptr<Encoder> e = encoder.lock ();
+ if (e) {
+ e->servers_list_changed ();
}
}
return _history_size / (seconds (now) - seconds (_time_history.back ()));
}
-/** @return Number of video frames that have been sent out */
+/** @return Number of video frames that have been queued for encoding */
int
-Encoder::video_frames_out () const
+Encoder::video_frames_enqueued () const
{
- boost::mutex::scoped_lock (_state_mutex);
- return _position;
+ if (!_last_player_video) {
+ return 0;
+ }
+
+ return _last_player_video->time().frames_floor (_film->video_frame_rate ());
}
/** Should be called when a frame has been encoded successfully.
* 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)
+Encoder::encode (shared_ptr<PlayerVideo> pv)
{
_waker.nudge ();
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 * 2 && !_terminate_enqueue) {
- LOG_TIMING ("decoder-sleep queue=%1", _queue.size());
+ /* Wait until the queue has gone down a bit. Allow one thing in the queue even
+ when there are no threads.
+ */
+ while (_queue.size() >= (threads * 2) + 1) {
+ LOG_TIMING ("decoder-sleep queue=%1 threads=%2", _queue.size(), threads);
_full_condition.wait (queue_lock);
- LOG_TIMING ("decoder-wake queue=%1", _queue.size());
- }
-
- if (_terminate_enqueue) {
- return;
+ LOG_TIMING ("decoder-wake queue=%1 threads=%2", _queue.size(), threads);
}
_writer->rethrow ();
*/
rethrow ();
- if (_writer->can_fake_write (_position)) {
+ Frame const position = pv->time().frames_floor(_film->video_frame_rate());
+
+ if (_writer->can_fake_write (position)) {
/* We can fake-write this frame */
- _writer->fake_write (_position, 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(), _position, pv->eyes ());
- } else if (_last_player_video && _writer->can_repeat(_position) && pv->same (_last_player_video)) {
- _writer->repeat (_position, 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,
- _position,
+ position,
_film->video_frame_rate(),
_film->j2k_bandwidth(),
_film->resolution(),
void
Encoder::terminate_threads ()
{
- {
- boost::mutex::scoped_lock queue_lock (_queue_mutex);
- _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 ()) {
+ DCPOMATIC_ASSERT ((*i)->joinable ());
+ try {
(*i)->join ();
+ } catch (boost::thread_interrupted& e) {
+ /* This is to be expected */
}
delete *i;
LOG_GENERAL_NC ("Thread terminated");
}
_threads.clear ();
- _terminate_encoding = false;
}
void
-Encoder::encoder_thread (optional<ServerDescription> server)
+Encoder::encoder_thread (optional<EncodeServerDescription> server)
try
{
if (server) {
- LOG_TIMING ("start-encoder-thread thread=%1 server=%2", boost::this_thread::get_id (), server->host_name ());
+ LOG_TIMING ("start-encoder-thread thread=%1 server=%2", thread_id (), server->host_name ());
} else {
- LOG_TIMING ("start-encoder-thread thread=%1 server=localhost", boost::this_thread::get_id ());
+ LOG_TIMING ("start-encoder-thread thread=%1 server=localhost", thread_id ());
}
/* Number of seconds that we currently wait between attempts
while (true) {
- LOG_TIMING ("encoder-sleep thread=%1", boost::this_thread::get_id());
+ LOG_TIMING ("encoder-sleep thread=%1", thread_id ());
boost::mutex::scoped_lock lock (_queue_mutex);
- while (_queue.empty () && !_terminate_encoding) {
+ while (_queue.empty ()) {
_empty_condition.wait (lock);
}
- if (_terminate_encoding) {
- return;
- }
-
- LOG_TIMING ("encoder-wake thread=%1 queue=%2", boost::this_thread::get_id(), _queue.size());
+ LOG_TIMING ("encoder-wake thread=%1 queue=%2", thread_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 ());
+ LOG_TIMING ("encoder-pop thread=%1 frame=%2 eyes=%3", thread_id(), vf->index(), (int) vf->eyes ());
_queue.pop_front ();
lock.unlock ();
} else {
try {
- LOG_TIMING ("start-local-encode thread=%1 frame=%2", boost::this_thread::get_id(), vf->index());
+ LOG_TIMING ("start-local-encode thread=%1 frame=%2", thread_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());
+ LOG_TIMING ("finish-local-encode thread=%1 frame=%2", thread_id(), vf->index());
} catch (std::exception& e) {
LOG_ERROR (N_("Local encode failed (%1)"), e.what ());
throw;
frame_done ();
} else {
lock.lock ();
- LOG_GENERAL (N_("[%1] Encoder thread pushes frame %2 back onto queue after failure"), boost::this_thread::get_id(), vf->index());
+ LOG_GENERAL (N_("[%1] Encoder thread pushes frame %2 back onto queue after failure"), thread_id(), vf->index());
_queue.push_front (vf);
lock.unlock ();
}
if (remote_backoff > 0) {
- boost::this_thread::sleep_for (boost::chrono::seconds (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 */
_full_condition.notify_all ();
}
}
+catch (boost::thread_interrupted& e) {
+ /* Ignore these and just stop the thread */
+ _full_condition.notify_all ();
+}
catch (...)
{
store_current ();
boost::mutex::scoped_lock lm (_threads_mutex);
+#ifdef BOOST_THREAD_PLATFORM_WIN32
+ OSVERSIONINFO info;
+ info.dwOSVersionInfoSize = sizeof (OSVERSIONINFO);
+ GetVersionEx (&info);
+ bool const windows_xp = (info.dwMajorVersion == 5 && info.dwMinorVersion == 1);
+ if (windows_xp) {
+ LOG_GENERAL_NC (N_("Setting thread affinity for Windows XP"));
+ }
+#endif
+
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::thread* t = new boost::thread (boost::bind (&Encoder::encoder_thread, this, optional<EncodeServerDescription> ()));
+ _threads.push_back (t);
+#ifdef BOOST_THREAD_PLATFORM_WIN32
+ if (windows_xp) {
+ SetThreadAffinityMask (t->native_handle(), 1 << i);
+ }
+#endif
}
}
- 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)));