projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '1.0-alt-loop' into 1.0
[dcpomatic.git]
/
src
/
lib
/
transcode_job.cc
diff --git
a/src/lib/transcode_job.cc
b/src/lib/transcode_job.cc
index fe34867b250123a8722f5fe83c15ac74f403c2ab..6d5edd7c060c662dc404445c1e3ed1a1175d4ace 100644
(file)
--- a/
src/lib/transcode_job.cc
+++ b/
src/lib/transcode_job.cc
@@
-24,24
+24,22
@@
#include <iostream>
#include <iomanip>
#include "transcode_job.h"
#include <iostream>
#include <iomanip>
#include "transcode_job.h"
-#include "j2k_wav_encoder.h"
#include "film.h"
#include "film.h"
-#include "format.h"
#include "transcoder.h"
#include "transcoder.h"
-#include "film_state.h"
#include "log.h"
#include "log.h"
-#include "encoder_factory.h"
-using namespace std;
-using namespace boost;
+#include "i18n.h"
-/** @param s FilmState to use.
- * @param o Options.
- * @param l A log that we can write to.
+using std::string;
+using std::stringstream;
+using std::fixed;
+using std::setprecision;
+using boost::shared_ptr;
+
+/** @param s Film to use.
*/
*/
-TranscodeJob::TranscodeJob (shared_ptr<const FilmState> s, shared_ptr<const Options> o, Log* l, shared_ptr<Job> req)
- : Job (s, l, req)
- , _opt (o)
+TranscodeJob::TranscodeJob (shared_ptr<const Film> f)
+ : Job (f)
{
}
{
}
@@
-49,7
+47,7
@@
TranscodeJob::TranscodeJob (shared_ptr<const FilmState> s, shared_ptr<const Opti
string
TranscodeJob::name () const
{
string
TranscodeJob::name () const
{
- return String::compose (
"Transcode %1", _fs
->name());
+ return String::compose (
_("Transcode %1"), _film
->name());
}
void
}
void
@@
-57,21
+55,20
@@
TranscodeJob::run ()
{
try {
{
try {
- _
log->log ("Transcode job starting"
);
+ _
film->log()->log (N_("Transcode job starting")
);
- _encoder = encoder_factory (_fs, _opt, _log);
- Transcoder w (_fs, _opt, this, _log, _encoder);
- w.go ();
+ _transcoder.reset (new Transcoder (_film, shared_from_this ()));
+ _transcoder->go ();
set_progress (1);
set_state (FINISHED_OK);
set_progress (1);
set_state (FINISHED_OK);
- _
log->log ("Transcode job completed successfully"
);
+ _
film->log()->log (N_("Transcode job completed successfully")
);
} catch (std::exception& e) {
set_progress (1);
set_state (FINISHED_ERROR);
} catch (std::exception& e) {
set_progress (1);
set_state (FINISHED_ERROR);
- _
log->log (String::compose ("Transcode job failed (%1)"
, e.what()));
+ _
film->log()->log (String::compose (N_("Transcode job failed (%1)")
, e.what()));
throw;
}
throw;
}
@@
-80,33
+77,40
@@
TranscodeJob::run ()
string
TranscodeJob::status () const
{
string
TranscodeJob::status () const
{
- if (!_
en
coder) {
- return
"0%"
;
+ if (!_
trans
coder) {
+ return
_("0%")
;
}
}
- if (_encoder->skipping () && !finished ()) {
- return "skipping already-encoded frames";
- }
-
-
- float const fps = _encoder->current_frames_per_second ();
+ float const fps = _transcoder->current_encoding_rate ();
if (fps == 0) {
return Job::status ();
}
stringstream s;
if (fps == 0) {
return Job::status ();
}
stringstream s;
- s << Job::status () << "; " << fixed << setprecision (1) << fps << " frames per second";
+ s << Job::status ();
+
+ if (!finished ()) {
+ s << N_("; ") << fixed << setprecision (1) << fps << N_(" ") << _("frames per second");
+ }
+
return s.str ();
}
int
TranscodeJob::remaining_time () const
{
return s.str ();
}
int
TranscodeJob::remaining_time () const
{
- float fps = _encoder->current_frames_per_second ();
+ if (!_transcoder) {
+ return 0;
+ }
+
+ float fps = _transcoder->current_encoding_rate ();
+
if (fps == 0) {
return 0;
}
if (fps == 0) {
return 0;
}
- return ((_fs->dcp_length() - _encoder->last_frame()) / fps);
+ /* Compute approximate proposed length here, as it's only here that we need it */
+ OutputVideoFrame const left = _film->time_to_video_frames (_film->length ()) - _transcoder->video_frames_out();
+ return left / fps;
}
}