X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscode_job.cc;h=87e9a47c4b6ca678d5b7978f04471f91babe5ebe;hb=d0d93259d096faa0d410a27450445a3a1a16c430;hp=dfb9b107192748f7dbe8c6b4f2280cd69fa05057;hpb=58bf77268a8e82e73d7f17ab2fe6dcd29370ade3;p=dcpomatic.git

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index dfb9b1071..87e9a47c4 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -37,13 +37,11 @@ using std::setprecision;
 using boost::shared_ptr;
 
 /** @param s Film to use.
- *  @param o Options.
- *  @param req Job that must be completed before this job is run.
+ *  @param o Decode options.
  */
-TranscodeJob::TranscodeJob (shared_ptr<Film> f, shared_ptr<const DecodeOptions> od, shared_ptr<const EncodeOptions> oe, shared_ptr<Job> req)
-	: Job (f, req)
-	, _decode_opt (od)
-	, _encode_opt (oe)
+TranscodeJob::TranscodeJob (shared_ptr<Film> f, DecodeOptions o)
+	: Job (f)
+	, _decode_opt (o)
 {
 	
 }
@@ -62,13 +60,16 @@ TranscodeJob::run ()
 		_film->log()->log ("Transcode job starting");
 		_film->log()->log (String::compose ("Audio delay is %1ms", _film->audio_delay()));
 
-		_encoder.reset (new Encoder (_film, _encode_opt));
+		_encoder.reset (new Encoder (_film));
 		Transcoder w (_film, _decode_opt, this, _encoder);
 		w.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()));
 
 	} catch (std::exception& e) {
 
@@ -87,11 +88,6 @@ TranscodeJob::status () const
 		return "0%";
 	}
 
-	if (_encoder->skipping () && !finished ()) {
-		return "skipping already-encoded frames";
-	}
-		
-	
 	float const fps = _encoder->current_frames_per_second ();
 	if (fps == 0) {
 		return Job::status ();
@@ -116,11 +112,19 @@ TranscodeJob::remaining_time () const
 		return 0;
 	}
 
-	if (!_film->dcp_length()) {
+	if (!_film->length()) {
 		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 */
-	SourceFrame const left = _film->dcp_trim_start() + _film->dcp_length().get() - _encoder->video_frame();
+	int const left = length - _encoder->video_frames_out();
 	return left / fps;
 }