X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscode_job.cc;h=17108c27887917fd7ae11dfd94c688ba707980c2;hb=67a68bd971ebe1b35daa3f75873b4ccb53c00ba0;hp=a879e8c77d6331b67e6bcd0285a7bc4de1e4daeb;hpb=7feda7e97b67917d240585a09ed6c50d4605a83d;p=dcpomatic.git

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index a879e8c77..17108c278 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/>.
 
 */
 
@@ -27,7 +28,6 @@
 #include "film.h"
 #include "transcoder.h"
 #include "log.h"
-#include "safe_stringstream.h"
 #include "compose.hpp"
 #include <iostream>
 #include <iomanip>
@@ -44,8 +44,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)
 {
@@ -82,7 +81,7 @@ TranscodeJob::run ()
 
 		float fps = 0;
 		if (finish.tv_sec != start.tv_sec) {
-			fps = _transcoder->video_frames_out() / (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);
@@ -106,23 +105,28 @@ TranscodeJob::status () const
 		return Job::status ();
 	}
 
-	float const fps = _transcoder->current_encoding_rate ();
-	if (fps == 0) {
-		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() || _transcoder->finishing()) {
+		strncpy (buffer, Job::status().c_str(), 256);
+	} else {
+		snprintf (
+			buffer, sizeof(buffer), "%s; %d/%" PRId64 " frames",
+			Job::status().c_str(),
+			_transcoder->video_frames_enqueued(),
+			_film->length().frames_round (_film->video_frame_rate ())
+			);
+
+		float const fps = _transcoder->current_encoding_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 */
@@ -132,10 +136,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) {
@@ -143,5 +150,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;
 }