/*
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/>.
*/
/** @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 ();
}
void
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;
+ 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) {
+ while (_queue.size() >= threads * 2) {
LOG_TIMING ("decoder-sleep queue=%1", _queue.size());
_full_condition.wait (queue_lock);
LOG_TIMING ("decoder-wake queue=%1", _queue.size());
}
- if (_terminate_enqueue) {
- return;
- }
-
_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;
*/
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 ()) {
- (*i)->join ();
- }
+ DCPOMATIC_ASSERT ((*i)->joinable ());
+ (*i)->join ();
delete *i;
LOG_GENERAL_NC ("Thread terminated");
++n;
}
_threads.clear ();
- _terminate_encoding = false;
}
void
LOG_TIMING ("encoder-sleep thread=%1", boost::this_thread::get_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());
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 ());
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<EncodeServerDescription> ())));
+ 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
}
}