X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscode_job.cc;h=46fc97fb31b74bdf14f6093dd0d973e34fa78709;hb=8aeb741ccbe2edb528e98a431bf55459a6836a9b;hp=a53a4b6ad1591acb7227bbc578a37a3e014f613a;hpb=9dd38ef2f05b24ba669acb9805e0914ac227fff2;p=dcpomatic.git

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index a53a4b6ad..46fc97fb3 100644
--- 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 "j2k_wav_encoder.h"
 #include "film.h"
-#include "format.h"
 #include "transcoder.h"
-#include "film_state.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, o, l, req)
+TranscodeJob::TranscodeJob (shared_ptr<const Film> f)
+	: Job (f)
 {
 	
 }
@@ -48,7 +47,7 @@ TranscodeJob::TranscodeJob (shared_ptr<const FilmState> s, shared_ptr<const Opti
 string
 TranscodeJob::name () const
 {
-	return String::compose ("Transcode %1", _fs->name);
+	return String::compose (_("Transcode %1"), _film->name());
 }
 
 void
@@ -56,22 +55,21 @@ TranscodeJob::run ()
 {
 	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);
 
-		_log->log ("Transcode job completed successfully");
-
-	} catch (std::exception& e) {
+		_film->log()->log (N_("Transcode job completed successfully"));
+		_transcoder.reset ();
 
+	} catch (...) {
 		set_progress (1);
 		set_state (FINISHED_ERROR);
-		_log->log (String::compose ("Transcode job failed (%1)", e.what()));
-
+		_film->log()->log (N_("Transcode job failed or cancelled"));
+		_transcoder.reset ();
 		throw;
 	}
 }
@@ -79,33 +77,43 @@ TranscodeJob::run ()
 string
 TranscodeJob::status () const
 {
-	if (!_encoder) {
-		return "0%";
+	if (!_transcoder) {
+		return Job::status ();
 	}
 
-	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;
 
-	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
 {
-	float fps = _encoder->current_frames_per_second ();
+	/* _transcoder might be destroyed by the job-runner thread */
+	shared_ptr<Transcoder> t = _transcoder;
+	
+	if (!t) {
+		return 0;
+	}
+	
+	float fps = t->current_encoding_rate ();
+
 	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 */
+	VideoFrame const left = _film->time_to_video_frames (_film->length ()) - t->video_frames_out();
+	return left / fps;
 }