projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Only do long probes of FFmpeg content with the examiner, not the decoder.
[dcpomatic.git]
/
src
/
lib
/
transcode_job.cc
diff --git
a/src/lib/transcode_job.cc
b/src/lib/transcode_job.cc
index c910589739bf0433e1e4ddd9187a5d060b3c63d2..fd69b08e7c58b5a353570433d5f53c937585ed48 100644
(file)
--- a/
src/lib/transcode_job.cc
+++ b/
src/lib/transcode_job.cc
@@
-24,23
+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 Film
State> s, shared_ptr<const Options> o, Log* l
)
- : Job (
s, o, l
)
+TranscodeJob::TranscodeJob (shared_ptr<const Film
> f
)
+ : Job (
f
)
{
}
{
}
@@
-48,9
+47,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,60
+55,62
@@
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) {
} 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 (N_("Transcode job failed (%1)"), e.what()));
throw;
throw;
-
}
}
string
TranscodeJob::status () const
{
}
}
string
TranscodeJob::status () const
{
- if (!_
en
coder) {
- return
"0%"
;
+ if (!_
trans
coder) {
+ return
_("0%")
;
}
}
- if (_encoder->skipping () && !finished ()) {
- return "skipping frames already encoded";
- }
-
-
- 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 () && !_transcoder->finishing ()) {
+ s << "; " << fixed << setprecision (1) << fps << " " << _("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->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;
}
}