projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
encoder.cc
diff --git
a/src/lib/encoder.cc
b/src/lib/encoder.cc
index b78bcaeea7081bd12317608ff7e45a09695a18b7..5dc9e47c772cb7ec0e7c13a91b332c54bce63307 100644
(file)
--- a/
src/lib/encoder.cc
+++ b/
src/lib/encoder.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012
-2014
Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-35,9
+35,14
@@
#include "writer.h"
#include "server_finder.h"
#include "player.h"
#include "writer.h"
#include "server_finder.h"
#include "player.h"
+#include "player_video_frame.h"
#include "i18n.h"
#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);
+
using std::pair;
using std::string;
using std::stringstream;
using std::pair;
using std::string;
using std::stringstream;
@@
-60,17
+65,12
@@
Encoder::Encoder (shared_ptr<const Film> f, weak_ptr<Job> j)
, _video_frames_out (0)
, _terminate (false)
{
, _video_frames_out (0)
, _terminate (false)
{
- _have_a_real_frame[EYES_BOTH] = false;
- _have_a_real_frame[EYES_LEFT] = false;
- _have_a_real_frame[EYES_RIGHT] = false;
+
}
Encoder::~Encoder ()
{
terminate_threads ();
}
Encoder::~Encoder ()
{
terminate_threads ();
- if (_writer) {
- _writer->finish ();
- }
}
/** Add a worker thread for a each thread on a remote server. Caller must hold
}
/** Add a worker thread for a each thread on a remote server. Caller must hold
@@
-80,6
+80,7
@@
Encoder::~Encoder ()
void
Encoder::add_worker_threads (ServerDescription d)
{
void
Encoder::add_worker_threads (ServerDescription d)
{
+ LOG_GENERAL (N_("Adding %1 worker threads for remote %2"), d.host_name ());
for (int i = 0; i < d.threads(); ++i) {
_threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, d)));
}
for (int i = 0; i < d.threads(); ++i) {
_threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, d)));
}
@@
-101,11
+102,10
@@
Encoder::process_end ()
{
boost::mutex::scoped_lock lock (_mutex);
{
boost::mutex::scoped_lock lock (_mutex);
-
_film->log()->log (String::compose (N_("Clearing queue of %1"), _queue.size ()
));
+
LOG_GENERAL (N_("Clearing queue of %1"), _queue.size (
));
/* Keep waking workers until the queue is empty */
while (!_queue.empty ()) {
/* Keep waking workers until the queue is empty */
while (!_queue.empty ()) {
- _film->log()->log (String::compose (N_("Waking with %1"), _queue.size ()), Log::VERBOSE);
_condition.notify_all ();
_condition.wait (lock);
}
_condition.notify_all ();
_condition.wait (lock);
}
@@
-114,7
+114,7
@@
Encoder::process_end ()
terminate_threads ();
terminate_threads ();
-
_film->log()->log (String::compose (N_("Mopping up %1"), _queue.size()
));
+
LOG_GENERAL (N_("Mopping up %1"), _queue.size(
));
/* The following sequence of events can occur in the above code:
1. a remote worker takes the last image off the queue
/* The following sequence of events can occur in the above code:
1. a remote worker takes the last image off the queue
@@
-126,12
+126,12
@@
Encoder::process_end ()
*/
for (list<shared_ptr<DCPVideoFrame> >::iterator i = _queue.begin(); i != _queue.end(); ++i) {
*/
for (list<shared_ptr<DCPVideoFrame> >::iterator i = _queue.begin(); i != _queue.end(); ++i) {
-
_film->log()->log (String::compose (N_("Encode left-over frame %1"), (*i)->frame ()
));
+
LOG_GENERAL (N_("Encode left-over frame %1"), (*i)->index (
));
try {
try {
- _writer->write ((*i)->encode_locally(), (*i)->
frame
(), (*i)->eyes ());
+ _writer->write ((*i)->encode_locally(), (*i)->
index
(), (*i)->eyes ());
frame_done ();
} catch (std::exception& e) {
frame_done ();
} catch (std::exception& e) {
-
_film->log()->log (String::compose (N_("Local encode failed (%1)"), e.what ()
));
+
LOG_ERROR (N_("Local encode failed (%1)"), e.what (
));
}
}
}
}
@@
-181,17
+181,19
@@
Encoder::frame_done ()
}
void
}
void
-Encoder::process_video (shared_ptr<Player
Image> image, Eyes eyes, ColourConversion conversion, bool same
)
+Encoder::process_video (shared_ptr<Player
VideoFrame> pvf
)
{
{
+ _waker.nudge ();
+
boost::mutex::scoped_lock lock (_mutex);
/* XXX: discard 3D here if required */
/* Wait until the queue has gone down a bit */
while (_queue.size() >= _threads.size() * 2 && !_terminate) {
boost::mutex::scoped_lock lock (_mutex);
/* XXX: discard 3D here if required */
/* Wait until the queue has gone down a bit */
while (_queue.size() >= _threads.size() * 2 && !_terminate) {
- TIMING ("decoder sleeps with queue of %1", _queue.size());
+
LOG_
TIMING ("decoder sleeps with queue of %1", _queue.size());
_condition.wait (lock);
_condition.wait (lock);
- TIMING ("decoder wakes with queue of %1", _queue.size());
+
LOG_
TIMING ("decoder wakes with queue of %1", _queue.size());
}
if (_terminate) {
}
if (_terminate) {
@@
-206,28
+208,26
@@
Encoder::process_video (shared_ptr<PlayerImage> image, Eyes eyes, ColourConversi
rethrow ();
if (_writer->can_fake_write (_video_frames_out)) {
rethrow ();
if (_writer->can_fake_write (_video_frames_out)) {
- _writer->fake_write (_video_frames_out, eyes);
- _have_a_real_frame[eyes] = false;
- frame_done ();
- } else if (same && _have_a_real_frame[eyes]) {
- /* Use the last frame that we encoded. */
- _writer->repeat (_video_frames_out, eyes);
+ _writer->fake_write (_video_frames_out, pvf->eyes ());
frame_done ();
} else {
/* Queue this new frame for encoding */
frame_done ();
} else {
/* Queue this new frame for encoding */
- TIMING ("adding to queue of %1", _queue.size ());
+
LOG_
TIMING ("adding to queue of %1", _queue.size ());
_queue.push_back (shared_ptr<DCPVideoFrame> (
new DCPVideoFrame (
_queue.push_back (shared_ptr<DCPVideoFrame> (
new DCPVideoFrame (
- image->image(), _video_frames_out, eyes, conversion, _film->video_frame_rate(),
- _film->j2k_bandwidth(), _film->resolution(), _film->log()
+ pvf,
+ _video_frames_out,
+ _film->video_frame_rate(),
+ _film->j2k_bandwidth(),
+ _film->resolution(),
+ _film->log()
)
));
_condition.notify_all ();
)
));
_condition.notify_all ();
- _have_a_real_frame[eyes] = true;
}
}
- if (
eyes
!= EYES_LEFT) {
+ if (
pvf->eyes()
!= EYES_LEFT) {
++_video_frames_out;
}
}
++_video_frames_out;
}
}
@@
-269,7
+269,7
@@
try
while (1) {
while (1) {
-
TIMING ("encoder thread %1
sleeps", boost::this_thread::get_id());
+
LOG_TIMING ("[%1] encoder thread
sleeps", boost::this_thread::get_id());
boost::mutex::scoped_lock lock (_mutex);
while (_queue.empty () && !_terminate) {
_condition.wait (lock);
boost::mutex::scoped_lock lock (_mutex);
while (_queue.empty () && !_terminate) {
_condition.wait (lock);
@@
-279,9
+279,9
@@
try
return;
}
return;
}
-
TIMING ("encoder thread %1
wakes with queue of %2", boost::this_thread::get_id(), _queue.size());
+
LOG_TIMING ("[%1] encoder thread
wakes with queue of %2", boost::this_thread::get_id(), _queue.size());
shared_ptr<DCPVideoFrame> vf = _queue.front ();
shared_ptr<DCPVideoFrame> vf = _queue.front ();
-
TIMING ("encoder thread %1 pops frame %2 (%3) from queue", boost::this_thread::get_id(), vf->frame
(), vf->eyes ());
+
LOG_TIMING ("[%1] encoder thread pops frame %2 (%3) from queue", boost::this_thread::get_id(), vf->index
(), vf->eyes ());
_queue.pop_front ();
lock.unlock ();
_queue.pop_front ();
lock.unlock ();
@@
-293,7
+293,7
@@
try
encoded = vf->encode_remotely (server.get ());
if (remote_backoff > 0) {
encoded = vf->encode_remotely (server.get ());
if (remote_backoff > 0) {
-
_film->log()->log (String::compose (N_("%1 was lost, but now she is found; removing backoff"), server->host_name ()
));
+
LOG_GENERAL ("%1 was lost, but now she is found; removing backoff", server->host_name (
));
}
/* This job succeeded, so remove any backoff */
}
/* This job succeeded, so remove any backoff */
@@
-304,31
+304,28
@@
try
/* back off more */
remote_backoff += 10;
}
/* back off more */
remote_backoff += 10;
}
- _film->log()->log (
- String::compose (
- N_("Remote encode of %1 on %2 failed (%3); thread sleeping for %4s"),
- vf->frame(), server->host_name(), e.what(), remote_backoff)
+ LOG_ERROR (
+ N_("Remote encode of %1 on %2 failed (%3); thread sleeping for %4s"),
+ vf->index(), server->host_name(), e.what(), remote_backoff
);
}
} else {
try {
);
}
} else {
try {
-
TIMING ("encoder thread %1 begins local encode of %2", boost::this_thread::get_id(), vf->frame
());
+
LOG_TIMING ("[%1] encoder thread begins local encode of %2", boost::this_thread::get_id(), vf->index
());
encoded = vf->encode_locally ();
encoded = vf->encode_locally ();
-
TIMING ("encoder thread %1 finishes local encode of %2", boost::this_thread::get_id(), vf->frame
());
+
LOG_TIMING ("[%1] encoder thread finishes local encode of %2", boost::this_thread::get_id(), vf->index
());
} catch (std::exception& e) {
} catch (std::exception& e) {
-
_film->log()->log (String::compose (N_("Local encode failed (%1)"), e.what ()
));
+
LOG_ERROR (N_("Local encode failed (%1)"), e.what (
));
}
}
if (encoded) {
}
}
if (encoded) {
- _writer->write (encoded, vf->
frame
(), vf->eyes ());
+ _writer->write (encoded, vf->
index
(), vf->eyes ());
frame_done ();
} else {
lock.lock ();
frame_done ();
} else {
lock.lock ();
- _film->log()->log (
- String::compose (N_("Encoder thread %1 pushes frame %2 back onto queue after failure"), boost::this_thread::get_id(), vf->frame())
- );
+ LOG_GENERAL (N_("[%1] Encoder thread pushes frame %2 back onto queue after failure"), boost::this_thread::get_id(), vf->index());
_queue.push_front (vf);
lock.unlock ();
}
_queue.push_front (vf);
lock.unlock ();
}