X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscode_job.cc;h=a879e8c77d6331b67e6bcd0285a7bc4de1e4daeb;hb=1d933d796fd7589526378c5242c9fba1e039a37d;hp=fd4dfcef6dfc10c89b699777514377b1b47820b2;hpb=79ce26d031d109177ba4b0f637fa2960345a37a3;p=dcpomatic.git

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index fd4dfcef6..a879e8c77 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,27 +21,35 @@
  *  @brief A job which transcodes from one format to another.
  */
 
-#include <iostream>
-#include <iomanip>
 #include "transcode_job.h"
+#include "upload_job.h"
+#include "job_manager.h"
 #include "film.h"
 #include "transcoder.h"
 #include "log.h"
+#include "safe_stringstream.h"
+#include "compose.hpp"
+#include <iostream>
+#include <iomanip>
 
 #include "i18n.h"
 
+#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
+#define LOG_GENERAL_NC(...) _film->log()->log (__VA_ARGS__, LogEntry::TYPE_GENERAL);
+#define LOG_ERROR_NC(...)   _film->log()->log (__VA_ARGS__, LogEntry::TYPE_ERROR);
+
 using std::string;
-using std::stringstream;
 using std::fixed;
 using std::setprecision;
+using std::cout;
 using boost::shared_ptr;
 
 /** @param s Film to use.
  */
-TranscodeJob::TranscodeJob (shared_ptr<const Film> f)
-	: Job (f)
+TranscodeJob::TranscodeJob (shared_ptr<const Film> film)
+	: Job (film)
 {
-	
+
 }
 
 string
@@ -60,21 +68,32 @@ void
 TranscodeJob::run ()
 {
 	try {
-
-		_film->log()->log (N_("Transcode job starting"));
+		struct timeval start;
+		gettimeofday (&start, 0);
+		LOG_GENERAL_NC (N_("Transcode job starting"));
 
 		_transcoder.reset (new Transcoder (_film, shared_from_this ()));
 		_transcoder->go ();
 		set_progress (1);
 		set_state (FINISHED_OK);
 
-		_film->log()->log (N_("Transcode job completed successfully"));
+		struct timeval finish;
+		gettimeofday (&finish, 0);
+
+		float fps = 0;
+		if (finish.tv_sec != start.tv_sec) {
+			fps = _transcoder->video_frames_out() / (finish.tv_sec - start.tv_sec);
+		}
+
+		LOG_GENERAL (N_("Transcode job completed successfully: %1 fps"), fps);
 		_transcoder.reset ();
 
+		if (_film->upload_after_make_dcp ()) {
+			shared_ptr<Job> job (new UploadJob (_film));
+			JobManager::instance()->add (job);
+		}
+
 	} catch (...) {
-		set_progress (1);
-		set_state (FINISHED_ERROR);
-		_film->log()->log (N_("Transcode job failed or cancelled"));
 		_transcoder.reset ();
 		throw;
 	}
@@ -92,14 +111,17 @@ TranscodeJob::status () const
 		return Job::status ();
 	}
 
-	stringstream s;
+	SafeStringStream s;
 
 	s << Job::status ();
 
 	if (!finished () && !_transcoder->finishing ()) {
-		s << "; " << fixed << setprecision (1) << fps << " " << _("frames per second");
+		/// TRANSLATORS: fps here is an abbreviation for frames per second
+		s << "; " << _transcoder->video_frames_out() << "/"
+		  << _film->length().frames_round (_film->video_frame_rate ()) << " " << _("frames") << "; "
+		  << fixed << setprecision (1) << fps << " " << _("fps");
 	}
-	
+
 	return s.str ();
 }
 
@@ -109,11 +131,11 @@ TranscodeJob::remaining_time () const
 {
 	/* _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) {
@@ -121,5 +143,5 @@ TranscodeJob::remaining_time () const
 	}
 
 	/* Compute approximate proposed length here, as it's only here that we need it */
-	return (_film->length().frames (_film->video_frame_rate ()) - t->video_frames_out()) / fps;
+	return (_film->length().frames_round (_film->video_frame_rate ()) - t->video_frames_out()) / fps;
 }