X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscode_job.cc;h=420f5a8d219240ed726e617c9cab49febae7a9a5;hb=1f1661f36ffd7a5662847f0642c7a7ebdcadc0f0;hp=f10078f3c2714984b15035d45b679954399f9c72;hpb=4624e5b01145d332e2923bbf2c7f6f0103700a27;p=dcpomatic.git

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index f10078f3c..420f5a8d2 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,18 +23,21 @@
  */
 
 #include "transcode_job.h"
+#include "dcp_encoder.h"
+#include "upload_job.h"
+#include "job_manager.h"
 #include "film.h"
-#include "transcoder.h"
+#include "encoder.h"
 #include "log.h"
-#include "safe_stringstream.h"
 #include "compose.hpp"
 #include <iostream>
 #include <iomanip>
 
 #include "i18n.h"
 
-#define LOG_GENERAL_NC(...) _film->log()->log (__VA_ARGS__, Log::TYPE_GENERAL);
-#define LOG_ERROR_NC(...)   _film->log()->log (__VA_ARGS__, Log::TYPE_ERROR);
+#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::fixed;
@@ -41,8 +45,7 @@ using std::setprecision;
 using std::cout;
 using boost::shared_ptr;
 
-/** @param s Film to use.
- */
+/** @param film Film to use */
 TranscodeJob::TranscodeJob (shared_ptr<const Film> film)
 	: Job (film)
 {
@@ -61,23 +64,44 @@ TranscodeJob::json_name () const
 	return N_("transcode");
 }
 
+void
+TranscodeJob::set_encoder (shared_ptr<Encoder> e)
+{
+	_encoder = e;
+}
+
 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 ()));
-		_transcoder->go ();
+		DCPOMATIC_ASSERT (_encoder);
+		_encoder->go ();
 		set_progress (1);
 		set_state (FINISHED_OK);
 
-		LOG_GENERAL_NC (N_("Transcode job completed successfully"));
-		_transcoder.reset ();
+		struct timeval finish;
+		gettimeofday (&finish, 0);
+
+		float fps = 0;
+		if (finish.tv_sec != start.tv_sec) {
+			fps = _encoder->frames_done() / (finish.tv_sec - start.tv_sec);
+		}
+
+		LOG_GENERAL (N_("Transcode job completed successfully: %1 fps"), fps);
+		_encoder.reset ();
+
+		/* XXX: this shouldn't be here */
+		if (_film->upload_after_make_dcp ()) {
+			shared_ptr<Job> job (new UploadJob (_film));
+			JobManager::instance()->add (job);
+		}
 
 	} catch (...) {
-		_transcoder.reset ();
+		_encoder.reset ();
 		throw;
 	}
 }
@@ -85,46 +109,54 @@ TranscodeJob::run ()
 string
 TranscodeJob::status () const
 {
-	if (!_transcoder) {
-		return Job::status ();
-	}
-
-	float const fps = _transcoder->current_encoding_rate ();
-	if (fps == 0) {
+	if (!_encoder) {
 		return Job::status ();
 	}
 
-	SafeStringStream s;
-
-	s << Job::status ();
 
-	if (!finished () && !_transcoder->finishing ()) {
-		/// 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");
+	char buffer[256];
+	if (finished() || _encoder->finishing()) {
+		strncpy (buffer, Job::status().c_str(), 256);
+	} else {
+		snprintf (
+			buffer, sizeof(buffer), "%s; %" PRId64 "/%" PRId64 " frames",
+			Job::status().c_str(),
+			_encoder->frames_done(),
+			_film->length().frames_round (_film->video_frame_rate ())
+			);
+
+		float const fps = _encoder->current_rate ();
+		if (fps) {
+			char fps_buffer[64];
+			/// TRANSLATORS: fps here is an abbreviation for frames per second
+			snprintf (fps_buffer, sizeof(fps_buffer), _("; %.1f fps"), fps);
+			strncat (buffer, fps_buffer, strlen(buffer) - 1);
+		}
 	}
 
-	return s.str ();
+	return buffer;
 }
 
 /** @return Approximate remaining time in seconds */
 int
 TranscodeJob::remaining_time () const
 {
-	/* _transcoder might be destroyed by the job-runner thread */
-	shared_ptr<Transcoder> t = _transcoder;
+	/* _encoder might be destroyed by the job-runner thread */
+	shared_ptr<Encoder> e = _encoder;
 
-	if (!t) {
-		return 0;
+	if (!e || e->finishing()) {
+		/* We aren't doing any actual encoding so just use the job's guess */
+		return Job::remaining_time ();
 	}
 
-	float fps = t->current_encoding_rate ();
+	/* We're encoding so guess based on the current encoding rate */
+
+	float fps = e->current_rate ();
 
 	if (fps == 0) {
 		return 0;
 	}
 
 	/* 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 ()) - e->frames_done()) / fps;
 }