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 bb2fe682287b630baed38d0d4dbf02a0b9b324ec..2364b67a7ceccb5a1ced874efad51b83228fdcaa 100644
(file)
--- a/
src/lib/encoder.cc
+++ b/
src/lib/encoder.cc
@@
-61,9
+61,7
@@
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 ()
}
Encoder::~Encoder ()
@@
-125,9
+123,9
@@
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
()));
+ _film->log()->log (String::compose (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) {
_film->log()->log (String::compose (N_("Local encode failed (%1)"), e.what ()));
frame_done ();
} catch (std::exception& e) {
_film->log()->log (String::compose (N_("Local encode failed (%1)"), e.what ()));
@@
-180,7
+178,7
@@
Encoder::frame_done ()
}
void
}
void
-Encoder::process_video (shared_ptr<PlayerVideoFrame>
image, Eyes eyes, ColourConversion conversion, bool same
)
+Encoder::process_video (shared_ptr<PlayerVideoFrame>
pvf
)
{
_waker.nudge ();
{
_waker.nudge ();
@@
-207,28
+205,26
@@
Encoder::process_video (shared_ptr<PlayerVideoFrame> image, Eyes eyes, ColourCon
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 */
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(), _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;
}
}
@@
-282,7
+278,7
@@
try
TIMING ("encoder thread %1 wakes with queue of %2", boost::this_thread::get_id(), _queue.size());
shared_ptr<DCPVideoFrame> vf = _queue.front ();
TIMING ("encoder thread %1 wakes with queue of %2", boost::this_thread::get_id(), _queue.size());
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 ());
+ TIMING ("encoder thread %1 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 ();
@@
-308,27
+304,27
@@
try
_film->log()->log (
String::compose (
N_("Remote encode of %1 on %2 failed (%3); thread sleeping for %4s"),
_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)
+ 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
());
+ TIMING ("encoder thread %1 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
());
+ TIMING ("encoder thread %1 finishes local encode of %2", boost::this_thread::get_id(), vf->
index
());
} catch (std::exception& e) {
_film->log()->log (String::compose (N_("Local encode failed (%1)"), e.what ()));
}
}
if (encoded) {
} catch (std::exception& e) {
_film->log()->log (String::compose (N_("Local encode failed (%1)"), e.what ()));
}
}
if (encoded) {
- _writer->write (encoded, vf->
frame
(), vf->eyes ());
+ _writer->write (encoded, vf->
index
(), vf->eyes ());
frame_done ();
} else {
lock.lock ();
_film->log()->log (
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
())
+ String::compose (N_("Encoder thread %1 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 ();