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
/
transcode_job.cc
diff --git
a/src/lib/transcode_job.cc
b/src/lib/transcode_job.cc
index 74b425c1e6a3fd5b9f5340b10371c1050049a7a3..fd4dfcef6dfc10c89b699777514377b1b47820b2 100644
(file)
--- a/
src/lib/transcode_job.cc
+++ b/
src/lib/transcode_job.cc
@@
-50,6
+50,12
@@
TranscodeJob::name () const
return String::compose (_("Transcode %1"), _film->name());
}
return String::compose (_("Transcode %1"), _film->name());
}
+string
+TranscodeJob::json_name () const
+{
+ return N_("transcode");
+}
+
void
TranscodeJob::run ()
{
void
TranscodeJob::run ()
{
@@
-63,13
+69,13
@@
TranscodeJob::run ()
set_state (FINISHED_OK);
_film->log()->log (N_("Transcode job completed successfully"));
set_state (FINISHED_OK);
_film->log()->log (N_("Transcode job completed successfully"));
+ _transcoder.reset ();
- } catch (std::exception& e) {
-
+ } catch (...) {
set_progress (1);
set_state (FINISHED_ERROR);
set_progress (1);
set_state (FINISHED_ERROR);
- _film->log()->log (
String::compose (N_("Transcode job failed (%1)"), e.what()
));
-
+ _film->log()->log (
N_("Transcode job failed or cancelled"
));
+ _transcoder.reset ();
throw;
}
}
throw;
}
}
@@
-78,7
+84,7
@@
string
TranscodeJob::status () const
{
if (!_transcoder) {
TranscodeJob::status () const
{
if (!_transcoder) {
- return
_("0%"
);
+ return
Job::status (
);
}
float const fps = _transcoder->current_encoding_rate ();
}
float const fps = _transcoder->current_encoding_rate ();
@@
-90,27
+96,30
@@
TranscodeJob::status () const
s << Job::status ();
s << Job::status ();
- if (!finished ()) {
- s << "; " << fixed << setprecision (1) << fps <<
N_(" ")
<< _("frames per second");
+ if (!finished ()
&& !_transcoder->finishing ()
) {
+ s << "; " << fixed << setprecision (1) << fps <<
" "
<< _("frames per second");
}
return s.str ();
}
}
return s.str ();
}
+/** @return Approximate remaining time in seconds */
int
TranscodeJob::remaining_time () const
{
int
TranscodeJob::remaining_time () const
{
- if (!_transcoder) {
+ /* _transcoder might be destroyed by the job-runner thread */
+ shared_ptr<Transcoder> t = _transcoder;
+
+ if (!t) {
return 0;
}
return 0;
}
- float fps =
_transcoder
->current_encoding_rate ();
+ float fps =
t
->current_encoding_rate ();
if (fps == 0) {
return 0;
}
/* Compute approximate proposed length here, as it's only here that we need it */
if (fps == 0) {
return 0;
}
/* Compute approximate proposed length here, as it's only here that we need it */
- OutputVideoFrame const left = _film->time_to_video_frames (_film->length ()) - _transcoder->video_frames_out();
- return left / fps;
+ return (_film->length().frames (_film->video_frame_rate ()) - t->video_frames_out()) / fps;
}
}