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 f0faf7c637205ba3f46b2aa05b35af9946970f2e..23a46d06dddcb7875a9247911d387028a0da802e 100644
(file)
--- a/
src/lib/transcode_job.cc
+++ b/
src/lib/transcode_job.cc
@@
-27,13
+27,17
@@
#include "film.h"
#include "transcoder.h"
#include "log.h"
#include "film.h"
#include "transcoder.h"
#include "log.h"
+#include "safe_stringstream.h"
#include "i18n.h"
#include "i18n.h"
+#define LOG_GENERAL_NC(...) _film->log()->log (__VA_ARGS__, Log::TYPE_GENERAL);
+#define LOG_ERROR_NC(...) _film->log()->log (__VA_ARGS__, Log::TYPE_ERROR);
+
using std::string;
using std::string;
-using std::stringstream;
using std::fixed;
using std::setprecision;
using std::fixed;
using std::setprecision;
+using std::cout;
using boost::shared_ptr;
/** @param s Film to use.
using boost::shared_ptr;
/** @param s Film to use.
@@
-55,21
+59,21
@@
TranscodeJob::run ()
{
try {
{
try {
-
_film->log()->log
(N_("Transcode job starting"));
+
LOG_GENERAL_NC
(N_("Transcode job starting"));
_transcoder.reset (new Transcoder (_film, shared_from_this ()));
_transcoder->go ();
set_progress (1);
set_state (FINISHED_OK);
_transcoder.reset (new Transcoder (_film, shared_from_this ()));
_transcoder->go ();
set_progress (1);
set_state (FINISHED_OK);
- _film->log()->log (N_("Transcode job completed successfully"));
-
- } catch (std::exception& e) {
+ LOG_GENERAL_NC (N_("Transcode job completed successfully"));
+ _transcoder.reset ();
+ } 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()
));
-
+
LOG_ERROR_NC (N_("Transcode job failed or cancelled"
));
+ _transcoder.reset ();
throw;
}
}
throw;
}
}
@@
-78,7
+82,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 ();
@@
-86,31
+90,34
@@
TranscodeJob::status () const
return Job::status ();
}
return Job::status ();
}
-
strings
tream s;
+
SafeStringS
tream s;
s << Job::status ();
s << Job::status ();
- if (!finished ()) {
- s <<
N_("; ") << 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_with_loop ()) - _transcoder->video_frames_out();
- return left / fps;
+ return (_film->length().frames (_film->video_frame_rate ()) - t->video_frames_out()) / fps;
}
}