projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace Time::frames with Time::frames_round and Time::frames_floor.
[dcpomatic.git]
/
src
/
lib
/
transcode_job.cc
diff --git
a/src/lib/transcode_job.cc
b/src/lib/transcode_job.cc
index a0537cd428b343f2190bd07a57bdaee8ad65953c..122f7f79921545a79522c40bb185f3b6cccf5b1f 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
@@
-27,21
+27,25
@@
#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.
*/
-TranscodeJob::TranscodeJob (shared_ptr<const Film> f)
- : Job (f)
+TranscodeJob::TranscodeJob (shared_ptr<const Film> f
ilm
)
+ : Job (f
ilm
)
{
{
-
+
}
string
}
string
@@
-61,20
+65,17
@@
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"));
+
LOG_GENERAL_NC
(N_("Transcode job completed successfully"));
_transcoder.reset ();
} catch (...) {
_transcoder.reset ();
} catch (...) {
- set_progress (1);
- set_state (FINISHED_ERROR);
- _film->log()->log (N_("Transcode job failed or cancelled"));
_transcoder.reset ();
throw;
}
_transcoder.reset ();
throw;
}
@@
-92,27
+93,29
@@
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 << "; " << fixed << setprecision (1) << fps << " " << _("fps");
}
}
-
+
return s.str ();
}
return s.str ();
}
+/** @return Approximate remaining time in seconds */
int
TranscodeJob::remaining_time () const
{
/* _transcoder might be destroyed by the job-runner thread */
shared_ptr<Transcoder> t = _transcoder;
int
TranscodeJob::remaining_time () const
{
/* _transcoder might be destroyed by the job-runner thread */
shared_ptr<Transcoder> t = _transcoder;
-
+
if (!t) {
return 0;
}
if (!t) {
return 0;
}
-
+
float fps = t->current_encoding_rate ();
if (fps == 0) {
float fps = t->current_encoding_rate ();
if (fps == 0) {
@@
-120,6
+123,5
@@
TranscodeJob::remaining_time () const
}
/* Compute approximate proposed length here, as it's only here that we need it */
}
/* Compute approximate proposed length here, as it's only here that we need it */
- VideoFrame const left = _film->time_to_video_frames (_film->length ()) - t->video_frames_out();
- return left / fps;
+ return (_film->length().frames_round (_film->video_frame_rate ()) - t->video_frames_out()) / fps;
}
}