#include <iomanip>
#include "transcode_job.h"
#include "film.h"
-#include "format.h"
#include "transcoder.h"
#include "log.h"
-#include "encoder.h"
+
+#include "i18n.h"
using std::string;
using std::stringstream;
using boost::shared_ptr;
/** @param s Film to use.
- * @param o Decode options.
*/
-TranscodeJob::TranscodeJob (shared_ptr<Film> f, DecodeOptions o)
+TranscodeJob::TranscodeJob (shared_ptr<const Film> f)
: Job (f)
- , _decode_opt (o)
{
}
string
TranscodeJob::name () const
{
- return String::compose ("Transcode %1", _film->name());
+ return String::compose (_("Transcode %1"), _film->name());
}
void
{
try {
- _film->log()->log ("Transcode job starting");
- _film->log()->log (String::compose ("Audio delay is %1ms", _film->audio_delay()));
+ _film->log()->log (N_("Transcode job starting"));
- _encoder.reset (new Encoder (_film));
- Transcoder w (_film, _decode_opt, this, _encoder);
- w.go ();
+ _transcoder.reset (new Transcoder (_film, shared_from_this ()));
+ _transcoder->go ();
set_progress (1);
set_state (FINISHED_OK);
- _film->set_dcp_intrinsic_duration (_encoder->video_frames_out ());
-
- _film->log()->log ("Transcode job completed successfully");
- _film->log()->log (String::compose ("DCP intrinsic duration is %1", _encoder->video_frames_out()));
+ _film->log()->log (N_("Transcode job completed successfully"));
} catch (std::exception& e) {
set_progress (1);
set_state (FINISHED_ERROR);
- _film->log()->log (String::compose ("Transcode job failed (%1)", e.what()));
+ _film->log()->log (String::compose (N_("Transcode job failed (%1)"), e.what()));
throw;
}
string
TranscodeJob::status () const
{
- if (!_encoder) {
- return "0%";
+ if (!_transcoder) {
+ return _("0%");
}
- float const fps = _encoder->current_frames_per_second ();
+ float const fps = _transcoder->current_encoding_rate ();
if (fps == 0) {
return Job::status ();
}
s << Job::status ();
if (!finished ()) {
- s << "; " << fixed << setprecision (1) << fps << " frames per second";
+ s << "; " << fixed << setprecision (1) << fps << N_(" ") << _("frames per second");
}
return s.str ();
int
TranscodeJob::remaining_time () const
{
- float fps = _encoder->current_frames_per_second ();
- if (fps == 0) {
+ if (!_transcoder) {
return 0;
}
+
+ float fps = _transcoder->current_encoding_rate ();
- if (!_film->length()) {
+ if (fps == 0) {
return 0;
}
/* Compute approximate proposed length here, as it's only here that we need it */
- int length = _film->length().get();
- DCPFrameRate const dfr (_film->frames_per_second ());
- if (dfr.skip) {
- length /= 2;
- }
- /* If we are repeating it shouldn't affect transcode time, so don't take it into account */
-
- /* We assume that dcp_length() is valid, if it is set */
- int const left = length - _encoder->video_frames_out();
+ OutputVideoFrame const left = _film->time_to_video_frames (_film->length ()) - _transcoder->video_frames_out();
return left / fps;
}