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);
- _film->log()->log (String::compose (N_("Transcode job failed (%1)"), e.what()));
-
+ _film->log()->log (N_("Transcode job failed or cancelled"));
+ _transcoder.reset ();
throw;
}
}
TranscodeJob::status () const
{
if (!_transcoder) {
- return _("0%");
+ return Job::status ();
}
float const fps = _transcoder->current_encoding_rate ();
s << Job::status ();
- if (!finished ()) {
- if (_transcoder->state() == Encoder::TRANSCODING) {
- s << "; " << fixed << setprecision (1) << fps << N_(" ") << _("frames per second");
- } else {
- /* TRANSLATORS: this means `computing a hash' as in a digest of a block of data */
- s << "; " << _("hashing");
- }
+ if (!finished () && !_transcoder->finishing ()) {
+ s << "; " << fixed << setprecision (1) << fps << " " << _("frames per second");
}
return s.str ();
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;
}
- 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 */
- OutputVideoFrame const left = _film->time_to_video_frames (_film->length ()) - _transcoder->video_frames_out();
+ VideoFrame const left = _film->time_to_video_frames (_film->length ()) - t->video_frames_out();
return left / fps;
}