X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscode_job.cc;h=e9a59c743ad3fc81e12abceb3c320f11a4db485d;hb=dea922bbc1fa2b643140a6b5275e58a1fb0225c9;hp=c9792ed2e8821bcabba5177a2fba389a8941cecf;hpb=4870ce43dd314d557f7b14938456138c746fd617;p=dcpomatic.git

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index c9792ed2e..e9a59c743 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -67,7 +67,10 @@ TranscodeJob::run ()
 		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) {
 
@@ -86,11 +89,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 ();
@@ -115,11 +113,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->trim_start() + _film->dcp_length().get() - _encoder->video_frame();
+	int const left = length - _encoder->video_frames_out();
 	return left / fps;
 }