X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscode_job.cc;h=fd69b08e7c58b5a353570433d5f53c937585ed48;hb=a0c0e609f7fbff8513135428378cc16684bae937;hp=234ebe051f0b44ae678b43cd8e20cd1def6af5dc;hpb=2f7180555f2d8b727bde21613fc2474bb4f7664c;p=dcpomatic.git

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 234ebe051..fd69b08e7 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -25,10 +25,8 @@
 #include <iomanip>
 #include "transcode_job.h"
 #include "film.h"
-#include "format.h"
 #include "transcoder.h"
 #include "log.h"
-#include "encoder.h"
 
 #include "i18n.h"
 
@@ -39,11 +37,9 @@ using std::setprecision;
 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)
 {
 	
 }
@@ -60,11 +56,9 @@ TranscodeJob::run ()
 	try {
 
 		_film->log()->log (N_("Transcode job starting"));
-		_film->log()->log (String::compose (N_("Audio delay is %1ms"), _film->audio_delay()));
 
-		_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);
 
@@ -83,11 +77,11 @@ TranscodeJob::run ()
 string
 TranscodeJob::status () const
 {
-	if (!_encoder) {
+	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 ();
 	}
@@ -96,8 +90,8 @@ TranscodeJob::status () const
 
 	s << Job::status ();
 
-	if (!finished ()) {
-		s << N_("; ") << fixed << setprecision (1) << fps << N_(" ") << _("frames per second");
+	if (!finished () && !_transcoder->finishing ()) {
+		s << "; " << fixed << setprecision (1) << fps << " " << _("frames per second");
 	}
 	
 	return s.str ();
@@ -106,24 +100,17 @@ TranscodeJob::status () const
 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();
-	FrameRateConversion const frc (_film->source_frame_rate(), _film->dcp_frame_rate());
-	if (frc.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;
 }