projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated nl_NL translation from Rob van Nieuwkerk.
[dcpomatic.git]
/
src
/
lib
/
transcode_job.cc
diff --git
a/src/lib/transcode_job.cc
b/src/lib/transcode_job.cc
index fe07ba2f656af010c1ff989a53a4f1e088822ed6..7d11d51a9589c474306068fbafd47f20eb05ed6f 100644
(file)
--- a/
src/lib/transcode_job.cc
+++ b/
src/lib/transcode_job.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012
-2015
Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-21,27
+21,32
@@
* @brief A job which transcodes from one format to another.
*/
* @brief A job which transcodes from one format to another.
*/
-#include <iostream>
-#include <iomanip>
#include "transcode_job.h"
#include "film.h"
#include "transcoder.h"
#include "log.h"
#include "transcode_job.h"
#include "film.h"
#include "transcoder.h"
#include "log.h"
+#include "safe_stringstream.h"
+#include "compose.hpp"
+#include <iostream>
+#include <iomanip>
#include "i18n.h"
#include "i18n.h"
+#define LOG_GENERAL_NC(...) _film->log()->log (__VA_ARGS__, LogEntry::TYPE_GENERAL);
+#define LOG_ERROR_NC(...) _film->log()->log (__VA_ARGS__, LogEntry::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.
*/
-TranscodeJob::TranscodeJob (shared_ptr<const Film> f)
- : Job (f)
+TranscodeJob::TranscodeJob (shared_ptr<const Film> f
ilm
)
+ : Job (f
ilm
)
{
{
-
+
}
string
}
string
@@
-50,26
+55,29
@@
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"));
-
- } catch (std::exception& e) {
-
- set_progress (1);
- set_state (FINISHED_ERROR);
- _film->log()->log (String::compose (N_("Transcode job failed (%1)"), e.what()));
+ LOG_GENERAL_NC (N_("Transcode job completed successfully"));
+ _transcoder.reset ();
+ } catch (...) {
+ _transcoder.reset ();
throw;
}
}
throw;
}
}
@@
-78,7
+86,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
+94,37
@@
TranscodeJob::status () const
return Job::status ();
}
return Job::status ();
}
-
strings
tream s;
+
SafeStringS
tream s;
s << Job::status ();
if (!finished () && !_transcoder->finishing ()) {
s << Job::status ();
if (!finished () && !_transcoder->finishing ()) {
- s << "; " << fixed << setprecision (1) << fps << " " << _("frames per second");
+ /// TRANSLATORS: fps here is an abbreviation for frames per second
+ s << "; " << _transcoder->video_frames_out() << "/"
+ << _film->length().frames_round (_film->video_frame_rate ()) << " " << _("frames") << "; "
+ << fixed << setprecision (1) << fps << " " << _("fps");
}
}
-
+
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_round (_film->video_frame_rate ()) - t->video_frames_out()) / fps;
}
}