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 ca9134c04d29e52400579330eb34d4fa75a5196e..8f31b596eb8f4d972f38eb95c3b9e84c8e9d921f 100644
(file)
--- a/
src/lib/encoder.cc
+++ b/
src/lib/encoder.cc
@@
-35,6
+35,7
@@
#include "writer.h"
#include "server_finder.h"
#include "player.h"
#include "writer.h"
#include "server_finder.h"
#include "player.h"
+#include "dcp_video.h"
#include "i18n.h"
#include "i18n.h"
@@
-60,17
+61,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
+76,7
@@
Encoder::~Encoder ()
void
Encoder::add_worker_threads (ServerDescription d)
{
void
Encoder::add_worker_threads (ServerDescription d)
{
+ _film->log()->log (String::compose (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)));
}
@@
-181,8
+178,10
@@
Encoder::frame_done ()
}
void
}
void
-Encoder::process_video (shared_ptr<
PlayerImage> image, Eyes eyes, ColourConversion conversion, bool s
ame)
+Encoder::process_video (shared_ptr<
DCPVideo> fr
ame)
{
{
+ _waker.nudge ();
+
boost::mutex::scoped_lock lock (_mutex);
/* XXX: discard 3D here if required */
boost::mutex::scoped_lock lock (_mutex);
/* XXX: discard 3D here if required */
@@
-206,28
+205,28
@@
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, frame->eyes ());
frame_done ();
} else {
/* Queue this new frame for encoding */
TIMING ("adding to queue of %1", _queue.size ());
_queue.push_back (shared_ptr<DCPVideoFrame> (
new DCPVideoFrame (
frame_done ();
} else {
/* Queue this new frame for encoding */
TIMING ("adding to queue of %1", _queue.size ());
_queue.push_back (shared_ptr<DCPVideoFrame> (
new DCPVideoFrame (
- image->image(PIX_FMT_RGB24, false), _video_frames_out, eyes, conversion, _film->video_frame_rate(),
- _film->j2k_bandwidth(), _film->resolution(), _film->log()
+ frame->image(PIX_FMT_RGB24, false),
+ _video_frames_out,
+ frame->eyes(),
+ frame->conversion(),
+ _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 (
frame->eyes()
!= EYES_LEFT) {
++_video_frames_out;
}
}
++_video_frames_out;
}
}