X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fj2k_encoder.cc;h=5dee5ca35af998c07ed1ebcc76684b25c946563c;hp=64cd3814784306877628794326fdcec462cd88af;hb=ac34066d5e448d1984d11a180be74e31b6e13b5c;hpb=44532cd5f87df3ef10bbbd6b987492e36e4a0eb6 diff --git a/src/lib/j2k_encoder.cc b/src/lib/j2k_encoder.cc index 64cd38147..5dee5ca35 100644 --- a/src/lib/j2k_encoder.cc +++ b/src/lib/j2k_encoder.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2019 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,10 +18,12 @@ */ + /** @file src/j2k_encoder.cc * @brief J2K encoder class. */ + #include "j2k_encoder.h" #include "util.h" #include "film.h" @@ -37,20 +39,22 @@ #include "encode_server_description.h" #include "compose.hpp" #include -#include #include #include "i18n.h" + using std::list; using std::cout; using std::exception; -using boost::shared_ptr; -using boost::weak_ptr; +using std::shared_ptr; +using std::weak_ptr; +using std::make_shared; using boost::optional; using dcp::Data; using namespace dcpomatic; + /** @param film Film that we are encoding. * @param writer Writer that we are using. */ @@ -62,20 +66,24 @@ J2KEncoder::J2KEncoder (shared_ptr film, shared_ptr writer) servers_list_changed (); } + J2KEncoder::~J2KEncoder () { + boost::mutex::scoped_lock lm (_threads_mutex); terminate_threads (); } + void J2KEncoder::begin () { - weak_ptr wp = shared_from_this (); + auto wp = shared_from_this (); _server_found_connection = EncodeServerFinder::instance()->ServersListChanged.connect ( boost::bind (&J2KEncoder::call_servers_list_changed, wp) ); } + /* We don't want the servers-list-changed callback trying to do things during destruction of J2KEncoder, and I think this is the neatest way to achieve that. @@ -83,12 +91,13 @@ J2KEncoder::begin () void J2KEncoder::call_servers_list_changed (weak_ptr encoder) { - shared_ptr e = encoder.lock (); + auto e = encoder.lock (); if (e) { e->servers_list_changed (); } } + void J2KEncoder::end () { @@ -107,7 +116,10 @@ J2KEncoder::end () LOG_GENERAL_NC (N_("Terminating encoder threads")); - terminate_threads (); + { + boost::mutex::scoped_lock lm (_threads_mutex); + terminate_threads (); + } /* Something might have been thrown during terminate_threads */ rethrow (); @@ -123,13 +135,13 @@ J2KEncoder::end () So just mop up anything left in the queue here. */ - for (list >::iterator i = _queue.begin(); i != _queue.end(); ++i) { - LOG_GENERAL (N_("Encode left-over frame %1"), (*i)->index ()); + for (auto i: _queue) { + LOG_GENERAL(N_("Encode left-over frame %1"), i->index()); try { _writer->write ( - (*i)->encode_locally(), - (*i)->index(), - (*i)->eyes() + make_shared(i->encode_locally()), + i->index(), + i->eyes() ); frame_done (); } catch (std::exception& e) { @@ -138,6 +150,7 @@ J2KEncoder::end () } } + /** @return an estimate of the current number of frames we are encoding per second, * if known. */ @@ -147,6 +160,7 @@ J2KEncoder::current_encoding_rate () const return _history.rate (); } + /** @return Number of video frames that have been queued for encoding */ int J2KEncoder::video_frames_enqueued () const @@ -158,6 +172,7 @@ J2KEncoder::video_frames_enqueued () const return _last_player_video_time->frames_floor (_film->video_frame_rate ()); } + /** Should be called when a frame has been encoded successfully */ void J2KEncoder::frame_done () @@ -165,6 +180,7 @@ J2KEncoder::frame_done () _history.event (); } + /** Called to request 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 @@ -178,7 +194,11 @@ J2KEncoder::encode (shared_ptr pv, DCPTime time) { _waker.nudge (); - size_t threads = _threads->size(); + size_t threads = 0; + { + boost::mutex::scoped_lock lm (_threads_mutex); + threads = _threads->size(); + } boost::mutex::scoped_lock queue_lock (_queue_mutex); @@ -198,7 +218,7 @@ J2KEncoder::encode (shared_ptr pv, DCPTime time) */ rethrow (); - Frame const position = time.frames_floor(_film->video_frame_rate()); + auto const position = time.frames_floor(_film->video_frame_rate()); if (_writer->can_fake_write (position)) { /* We can fake-write this frame */ @@ -209,22 +229,21 @@ J2KEncoder::encode (shared_ptr pv, DCPTime time) LOG_DEBUG_ENCODE("Frame @ %1 J2K", to_string(time)); /* This frame already has J2K data, so just write it */ _writer->write (pv->j2k(), position, pv->eyes ()); - } else if (_last_player_video[pv->eyes()] && _writer->can_repeat(position) && pv->same (_last_player_video[pv->eyes()])) { + frame_done (); + } else if (_last_player_video[static_cast(pv->eyes())] && _writer->can_repeat(position) && pv->same (_last_player_video[static_cast(pv->eyes())])) { LOG_DEBUG_ENCODE("Frame @ %1 REPEAT", to_string(time)); _writer->repeat (position, pv->eyes ()); } else { LOG_DEBUG_ENCODE("Frame @ %1 ENCODE", to_string(time)); /* Queue this new frame for encoding */ LOG_TIMING ("add-frame-to-queue queue=%1", _queue.size ()); - _queue.push_back (shared_ptr ( - new DCPVideo ( - pv, - position, - _film->video_frame_rate(), - _film->j2k_bandwidth(), - _film->resolution() - ) - )); + _queue.push_back (make_shared( + pv, + position, + _film->video_frame_rate(), + _film->j2k_bandwidth(), + _film->resolution() + )); /* The queue might not be empty any more, so notify anything which is waiting on that. @@ -232,10 +251,12 @@ J2KEncoder::encode (shared_ptr pv, DCPTime time) _empty_condition.notify_all (); } - _last_player_video[pv->eyes()] = pv; + _last_player_video[static_cast(pv->eyes())] = pv; _last_player_video_time = time; } + +/** Caller must hold a lock on _threads_mutex */ void J2KEncoder::terminate_threads () { @@ -257,10 +278,13 @@ J2KEncoder::terminate_threads () _threads.reset (); } + void J2KEncoder::encoder_thread (optional server) try { + start_of_thread ("J2KEncoder"); + if (server) { LOG_TIMING ("start-encoder-thread thread=%1 server=%2", thread_id (), server->host_name ()); } else { @@ -282,7 +306,7 @@ try } LOG_TIMING ("encoder-wake thread=%1 queue=%2", thread_id(), _queue.size()); - shared_ptr vf = _queue.front (); + auto vf = _queue.front (); /* We're about to commit to either encoding this frame or putting it back onto the queue, so we must not be interrupted until one or other of these things have happened. This @@ -296,12 +320,12 @@ try lock.unlock (); - optional encoded; + shared_ptr encoded; /* We need to encode this input */ if (server) { try { - encoded = vf->encode_remotely (server.get ()); + encoded = make_shared(vf->encode_remotely(server.get())); if (remote_backoff > 0) { LOG_GENERAL ("%1 was lost, but now she is found; removing backoff", server->host_name ()); @@ -324,7 +348,7 @@ try } else { try { LOG_TIMING ("start-local-encode thread=%1 frame=%2", thread_id(), vf->index()); - encoded = vf->encode_locally (); + encoded = make_shared(vf->encode_locally()); LOG_TIMING ("finish-local-encode thread=%1 frame=%2", thread_id(), vf->index()); } catch (std::exception& e) { /* This is very bad, so don't cope with it, just pass it on */ @@ -334,7 +358,7 @@ try } if (encoded) { - _writer->write (encoded.get(), vf->index (), vf->eyes ()); + _writer->write (encoded, vf->index(), vf->eyes()); frame_done (); } else { lock.lock (); @@ -364,18 +388,21 @@ catch (...) _full_condition.notify_all (); } + void J2KEncoder::servers_list_changed () { + boost::mutex::scoped_lock lm (_threads_mutex); + terminate_threads (); - _threads.reset (new boost::thread_group()); + _threads = make_shared(); /* XXX: could re-use threads */ if (!Config::instance()->only_servers_encode ()) { for (int i = 0; i < Config::instance()->master_encoding_threads (); ++i) { #ifdef DCPOMATIC_LINUX - boost::thread* t = _threads->create_thread(boost::bind(&J2KEncoder::encoder_thread, this, optional())); + auto t = _threads->create_thread(boost::bind(&J2KEncoder::encoder_thread, this, optional())); pthread_setname_np (t->native_handle(), "encode-worker"); #else _threads->create_thread(boost::bind(&J2KEncoder::encoder_thread, this, optional())); @@ -383,7 +410,7 @@ J2KEncoder::servers_list_changed () } } - BOOST_FOREACH (EncodeServerDescription i, EncodeServerFinder::instance()->servers()) { + for (auto i: EncodeServerFinder::instance()->servers()) { if (!i.current_link_version()) { continue; }