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 289259369d028652aa2fc684f7aabc4997c30971..4a85fa18aa8935d0a2c0ff5670f504de012b439e 100644
(file)
--- a/
src/lib/transcode_job.cc
+++ b/
src/lib/transcode_job.cc
@@
-30,10
+30,14
@@
#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::stringstream;
using std::fixed;
using std::setprecision;
using std::string;
using std::stringstream;
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.
@@
-50,25
+54,31
@@
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 ()
{
try {
void
TranscodeJob::run ()
{
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"));
+
LOG_GENERAL_NC
(N_("Transcode job completed successfully"));
_transcoder.reset ();
} catch (...) {
set_progress (1);
set_state (FINISHED_ERROR);
_transcoder.reset ();
} catch (...) {
set_progress (1);
set_state (FINISHED_ERROR);
-
_film->log()->log
(N_("Transcode job failed or cancelled"));
+
LOG_ERROR_NC
(N_("Transcode job failed or cancelled"));
_transcoder.reset ();
throw;
}
_transcoder.reset ();
throw;
}
@@
-97,20
+107,23
@@
TranscodeJob::status () const
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 */
- VideoFrame 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;
}
}