*/
-#include "j2k_encoder.h"
-#include "util.h"
-#include "film.h"
-#include "log.h"
-#include "dcpomatic_log.h"
+#include "compose.hpp"
#include "config.h"
-#include "dcp_video.h"
#include "cross.h"
-#include "writer.h"
+#include "dcp_video.h"
+#include "dcpomatic_log.h"
+#include "encode_server_description.h"
#include "encode_server_finder.h"
-#include "player.h"
+#include "film.h"
+#include "j2k_encoder.h"
+#include "log.h"
#include "player_video.h"
-#include "encode_server_description.h"
-#include "compose.hpp"
+#include "util.h"
+#include "writer.h"
#include <libcxml/cxml.h>
#include <iostream>
#include "i18n.h"
-using std::list;
using std::cout;
using std::exception;
+using std::list;
+using std::make_shared;
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.
*/
-J2KEncoder::J2KEncoder (shared_ptr<const Film> film, shared_ptr<Writer> writer)
+J2KEncoder::J2KEncoder(shared_ptr<const Film> film, Writer& writer)
: _film (film)
, _history (200)
, _writer (writer)
{
- servers_list_changed ();
}
J2KEncoder::~J2KEncoder ()
{
+ _server_found_connection.disconnect();
+
boost::mutex::scoped_lock lm (_threads_mutex);
terminate_threads ();
}
void
J2KEncoder::begin ()
{
- auto wp = shared_from_this ();
- _server_found_connection = EncodeServerFinder::instance()->ServersListChanged.connect (
- boost::bind (&J2KEncoder::call_servers_list_changed, wp)
+ _server_found_connection = EncodeServerFinder::instance()->ServersListChanged.connect(
+ boost::bind(&J2KEncoder::servers_list_changed, this)
);
-}
-
-
-/* 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.
-*/
-void
-J2KEncoder::call_servers_list_changed (weak_ptr<J2KEncoder> encoder)
-{
- auto e = encoder.lock ();
- if (e) {
- e->servers_list_changed ();
- }
+ servers_list_changed ();
}
So just mop up anything left in the queue here.
*/
- for (auto i: _queue) {
- LOG_GENERAL(N_("Encode left-over frame %1"), i->index());
+ for (auto const& i: _queue) {
+ LOG_GENERAL(N_("Encode left-over frame %1"), i.index());
try {
- _writer->write (
- make_shared<dcp::ArrayData>(i->encode_locally()),
- i->index(),
- i->eyes()
+ _writer.write(
+ make_shared<dcp::ArrayData>(i.encode_locally()),
+ i.index(),
+ i.eyes()
);
frame_done ();
} catch (std::exception& e) {
LOG_TIMING ("decoder-wake queue=%1 threads=%2", _queue.size(), threads);
}
- _writer->rethrow ();
+ _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;
but then, if that happens something has gone badly wrong.
auto const position = time.frames_floor(_film->video_frame_rate());
- if (_writer->can_fake_write (position)) {
+ if (_writer.can_fake_write(position)) {
/* We can fake-write this frame */
LOG_DEBUG_ENCODE("Frame @ %1 FAKE", to_string(time));
- _writer->fake_write (position, pv->eyes ());
+ _writer.fake_write(position, pv->eyes ());
frame_done ();
} else if (pv->has_j2k() && !_film->reencode_j2k()) {
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 ());
+ _writer.write(pv->j2k(), position, pv->eyes ());
frame_done ();
- } else if (_last_player_video[static_cast<int>(pv->eyes())] && _writer->can_repeat(position) && pv->same (_last_player_video[static_cast<int>(pv->eyes())])) {
+ } else if (_last_player_video[pv->eyes()] && _writer.can_repeat(position) && pv->same(_last_player_video[pv->eyes()])) {
LOG_DEBUG_ENCODE("Frame @ %1 REPEAT", to_string(time));
- _writer->repeat (position, pv->eyes ());
+ _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 (make_shared<DCPVideo>(
+ _queue.push_back (DCPVideo(
pv,
position,
_film->video_frame_rate(),
_empty_condition.notify_all ();
}
- _last_player_video[static_cast<int>(pv->eyes())] = pv;
+ _last_player_video[pv->eyes()] = pv;
_last_player_video_time = time;
}
J2KEncoder::encoder_thread (optional<EncodeServerDescription> server)
try
{
+ start_of_thread ("J2KEncoder");
+
if (server) {
LOG_TIMING ("start-encoder-thread thread=%1 server=%2", thread_id (), server->host_name ());
} else {
{
boost::this_thread::disable_interruption dis;
- LOG_TIMING ("encoder-pop thread=%1 frame=%2 eyes=%3", thread_id(), vf->index(), (int) vf->eyes ());
+ LOG_TIMING ("encoder-pop thread=%1 frame=%2 eyes=%3", thread_id(), vf.index(), static_cast<int>(vf.eyes()));
_queue.pop_front ();
lock.unlock ();
/* We need to encode this input */
if (server) {
try {
- encoded = make_shared<dcp::ArrayData>(vf->encode_remotely(server.get()));
+ encoded = make_shared<dcp::ArrayData>(vf.encode_remotely(server.get()));
if (remote_backoff > 0) {
LOG_GENERAL ("%1 was lost, but now she is found; removing backoff", server->host_name ());
}
LOG_ERROR (
N_("Remote encode of %1 on %2 failed (%3); thread sleeping for %4s"),
- vf->index(), server->host_name(), e.what(), remote_backoff
+ vf.index(), server->host_name(), e.what(), remote_backoff
);
}
} else {
try {
- LOG_TIMING ("start-local-encode thread=%1 frame=%2", thread_id(), vf->index());
- encoded = make_shared<dcp::ArrayData>(vf->encode_locally());
- LOG_TIMING ("finish-local-encode thread=%1 frame=%2", thread_id(), vf->index());
+ LOG_TIMING ("start-local-encode thread=%1 frame=%2", thread_id(), vf.index());
+ encoded = make_shared<dcp::ArrayData>(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 */
LOG_ERROR (N_("Local encode failed (%1)"), e.what ());
}
if (encoded) {
- _writer->write (encoded, vf->index(), vf->eyes());
+ _writer.write(encoded, vf.index(), vf.eyes());
frame_done ();
} else {
lock.lock ();
- LOG_GENERAL (N_("[%1] J2KEncoder thread pushes frame %2 back onto queue after failure"), thread_id(), vf->index());
+ LOG_GENERAL (N_("[%1] J2KEncoder thread pushes frame %2 back onto queue after failure"), thread_id(), vf.index());
_queue.push_front (vf);
lock.unlock ();
}
}
}
- _writer->set_encoder_threads (_threads->size());
+ _writer.set_encoder_threads(_threads->size());
}
projects / dcpomatic.git / blobdiff