projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve logging slightly.
[dcpomatic.git]
/
src
/
lib
/
transcode_job.cc
diff --git
a/src/lib/transcode_job.cc
b/src/lib/transcode_job.cc
index 2de6e90ca850e76769f5907c6839d4a955b63846..081e042521c962aa49c43b0a89c9732b0b6d479e 100644
(file)
--- a/
src/lib/transcode_job.cc
+++ b/
src/lib/transcode_job.cc
@@
-28,19
+28,22
@@
#include "film.h"
#include "format.h"
#include "transcoder.h"
#include "film.h"
#include "format.h"
#include "transcoder.h"
-#include "film_state.h"
#include "log.h"
#include "encoder_factory.h"
#include "log.h"
#include "encoder_factory.h"
-using namespace std;
-using namespace boost;
+using std::string;
+using std::stringstream;
+using std::fixed;
+using std::setprecision;
+using boost::shared_ptr;
-/** @param s Film
State
to use.
+/** @param s Film to use.
* @param o Options.
* @param o Options.
- * @param
l A log that we can write to
.
+ * @param
req Job that must be completed before this job is run
.
*/
*/
-TranscodeJob::TranscodeJob (shared_ptr<const FilmState> s, shared_ptr<const Options> o, Log* l)
- : Job (s, o, l)
+TranscodeJob::TranscodeJob (shared_ptr<Film> f, shared_ptr<const Options> o, shared_ptr<Job> req)
+ : Job (f, req)
+ , _opt (o)
{
}
{
}
@@
-48,9
+51,7
@@
TranscodeJob::TranscodeJob (shared_ptr<const FilmState> s, shared_ptr<const Opti
string
TranscodeJob::name () const
{
string
TranscodeJob::name () const
{
- stringstream s;
- s << "Transcode " << _fs->name;
- return s.str ();
+ return String::compose ("Transcode %1", _film->name());
}
void
}
void
@@
-58,24
+59,22
@@
TranscodeJob::run ()
{
try {
{
try {
- _log->log ("Transcode job starting");
+ _film->log()->log ("Transcode job starting");
+ _film->log()->log (String::compose ("Audio delay is %1ms", _film->audio_delay()));
- _encoder = encoder_factory (_f
s, _opt, _log
);
- Transcoder w (_f
s, _opt, this, _log
, _encoder);
+ _encoder = encoder_factory (_f
ilm, _opt
);
+ Transcoder w (_f
ilm, _opt, this
, _encoder);
w.go ();
set_progress (1);
set_state (FINISHED_OK);
w.go ();
set_progress (1);
set_state (FINISHED_OK);
- _
log
->log ("Transcode job completed successfully");
+ _
film->log()
->log ("Transcode job completed successfully");
} catch (std::exception& e) {
} catch (std::exception& e) {
- stringstream s;
set_progress (1);
set_state (FINISHED_ERROR);
set_progress (1);
set_state (FINISHED_ERROR);
-
- s << "Transcode job failed (" << e.what() << ")";
- _log->log (s.str ());
+ _film->log()->log (String::compose ("Transcode job failed (%1)", e.what()));
throw;
}
throw;
}
@@
-89,7
+88,7
@@
TranscodeJob::status () const
}
if (_encoder->skipping () && !finished ()) {
}
if (_encoder->skipping () && !finished ()) {
- return "skipping
frames already encoded
";
+ return "skipping
already-encoded frames
";
}
}
@@
-100,7
+99,12
@@
TranscodeJob::status () const
stringstream s;
stringstream s;
- s << Job::status () << "; " << fixed << setprecision (1) << fps << " frames per second";
+ s << Job::status ();
+
+ if (!finished ()) {
+ s << "; " << fixed << setprecision (1) << fps << " frames per second";
+ }
+
return s.str ();
}
return s.str ();
}
@@
-112,5
+116,7
@@
TranscodeJob::remaining_time () const
return 0;
}
return 0;
}
- return ((_fs->length - _encoder->last_frame()) / fps);
+ /* We assume that dcp_length() is valid */
+ SourceFrame const left = _film->dcp_trim_start() + _film->dcp_length().get() - _encoder->video_frame();
+ return left / fps;
}
}