Remove all use of stringstream in an attempt to fix

[dcpomatic.git] / src / lib / transcode_job.cc

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index fd4dfcef6dfc10c89b699777514377b1b47820b2..4eb2b1d290d6c6ed7d8c29adc7de2cd9c1e46f49 100644 (file)
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -1,19 +1,20 @@
 /*
-    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
+    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/>.
 
 */
 
@@ -21,27 +22,34 @@
  *  @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 "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_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 (...) {
-               set_progress (1);
-               set_state (FINISHED_ERROR);
-               _film->log()->log (N_("Transcode job failed or cancelled"));
                _transcoder.reset ();
                throw;
        }
@@ -92,15 +111,21 @@ TranscodeJob::status () const
                return Job::status ();
        }
 
-       stringstream s;
-
-       s << Job::status ();
-
-       if (!finished () && !_transcoder->finishing ()) {
-               s << "; " << fixed << setprecision (1) << fps << " " << _("frames per second");
+       char buffer[256];
+       if (finished() || _transcoder->finishing()) {
+               strncpy (buffer, Job::status().c_str(), 256);
+       } else {
+               /// TRANSLATORS: fps here is an abbreviation for frames per second
+               snprintf (
+                       buffer, sizeof(buffer), "%s; %d/%" PRId64 " frames; %.1f fps",
+                       Job::status().c_str(),
+                       _transcoder->video_frames_enqueued(),
+                       _film->length().frames_round (_film->video_frame_rate ()),
+                       fps
+                       );
        }
-       
-       return s.str ();
+
+       return buffer;
 }
 
 /** @return Approximate remaining time in seconds */
@@ -109,11 +134,14 @@ 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) {
@@ -121,5 +149,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_enqueued()) / fps;
 }