X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Ftranscode_job.cc;h=8e56603302e1200382197965d51b8c0cbf0f1ee1;hp=7d11d51a9589c474306068fbafd47f20eb05ed6f;hb=422be0eece2bf6ee80db1d3c21553cd82efff789;hpb=aeb835a18c8df347e0ed68fb24631b320abeb611

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 7d11d51a9..8e5660330 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -22,16 +23,19 @@
  */
 
 #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 <locked_sstream.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);
 
@@ -65,7 +69,8 @@ void
 TranscodeJob::run ()
 {
 	try {
-
+		struct timeval start;
+		gettimeofday (&start, 0);
 		LOG_GENERAL_NC (N_("Transcode job starting"));
 
 		_transcoder.reset (new Transcoder (_film, shared_from_this ()));
@@ -73,9 +78,22 @@ TranscodeJob::run ()
 		set_progress (1);
 		set_state (FINISHED_OK);
 
-		LOG_GENERAL_NC (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_enqueued() / (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 (...) {
 		_transcoder.reset ();
 		throw;
@@ -94,13 +112,13 @@ TranscodeJob::status () const
 		return Job::status ();
 	}
 
-	SafeStringStream s;
+	locked_stringstream s;
 
 	s << Job::status ();
 
 	if (!finished () && !_transcoder->finishing ()) {
 		/// TRANSLATORS: fps here is an abbreviation for frames per second
-		s << "; " << _transcoder->video_frames_out() << "/"
+		s << "; " << _transcoder->video_frames_enqueued() << "/"
 		  << _film->length().frames_round (_film->video_frame_rate ()) << " " << _("frames") << "; "
 		  << fixed << setprecision (1) << fps << " " << _("fps");
 	}
@@ -115,10 +133,13 @@ TranscodeJob::remaining_time () const
 	/* _transcoder might be destroyed by the job-runner thread */
 	shared_ptr<Transcoder> t = _transcoder;
 
-	if (!t) {
-		return 0;
+	if (!t || t->finishing()) {
+		/* We aren't doing any actual encoding so just use the job's guess */
+		return Job::remaining_time ();
 	}
 
+	/* We're encoding so guess based on the current encoding rate */
+
 	float fps = t->current_encoding_rate ();
 
 	if (fps == 0) {
@@ -126,5 +147,5 @@ TranscodeJob::remaining_time () const
 	}
 
 	/* Compute approximate proposed length here, as it's only here that we need it */
-	return (_film->length().frames_round (_film->video_frame_rate ()) - t->video_frames_out()) / fps;
+	return (_film->length().frames_round (_film->video_frame_rate ()) - t->video_frames_enqueued()) / fps;
 }