Primitive subtitle export feature.

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

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 420f5a8d219240ed726e617c9cab49febae7a9a5..55b4ef9b69aeadc4e9aaf87e397d9bd50aa10cd8 100644 (file)
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -29,21 +29,21 @@
 #include "film.h"
 #include "encoder.h"
 #include "log.h"
+#include "dcpomatic_log.h"
 #include "compose.hpp"
+#include "analytics.h"
 #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::fixed;
 using std::setprecision;
 using std::cout;
 using boost::shared_ptr;
+using boost::optional;
+using boost::dynamic_pointer_cast;
 
 /** @param film Film to use */
 TranscodeJob::TranscodeJob (shared_ptr<const Film> film)
@@ -52,10 +52,18 @@ TranscodeJob::TranscodeJob (shared_ptr<const Film> film)
 
 }
 
+TranscodeJob::~TranscodeJob ()
+{
+       /* We have to stop the job thread here as we're about to start tearing down
+          the Encoder, which is bad news if the job thread is still feeding it data.
+       */
+       stop_thread ();
+}
+
 string
 TranscodeJob::name () const
 {
-       return String::compose (_("Transcode %1"), _film->name());
+       return String::compose (_("Transcoding %1"), _film->name());
 }
 
 string
@@ -92,14 +100,19 @@ TranscodeJob::run ()
                }
 
                LOG_GENERAL (N_("Transcode job completed successfully: %1 fps"), fps);
-               _encoder.reset ();
+
+               if (dynamic_pointer_cast<DCPEncoder>(_encoder)) {
+                       Analytics::instance()->successful_dcp_encode();
+               }
 
                /* XXX: this shouldn't be here */
-               if (_film->upload_after_make_dcp ()) {
+               if (_film->upload_after_make_dcp() && dynamic_pointer_cast<DCPEncoder>(_encoder)) {
                        shared_ptr<Job> job (new UploadJob (_film));
                        JobManager::instance()->add (job);
                }
 
+               _encoder.reset ();
+
        } catch (...) {
                _encoder.reset ();
                throw;
@@ -116,7 +129,8 @@ TranscodeJob::status () const
 
        char buffer[256];
        if (finished() || _encoder->finishing()) {
-               strncpy (buffer, Job::status().c_str(), 256);
+               strncpy (buffer, Job::status().c_str(), 255);
+               buffer[255] = '\0';
        } else {
                snprintf (
                        buffer, sizeof(buffer), "%s; %" PRId64 "/%" PRId64 " frames",
@@ -125,11 +139,11 @@ TranscodeJob::status () const
                        _film->length().frames_round (_film->video_frame_rate ())
                        );
 
-               float const fps = _encoder->current_rate ();
+               optional<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);
+                       snprintf (fps_buffer, sizeof(fps_buffer), _("; %.1f fps"), *fps);
                        strncat (buffer, fps_buffer, strlen(buffer) - 1);
                }
        }
@@ -151,12 +165,12 @@ TranscodeJob::remaining_time () const
 
        /* We're encoding so guess based on the current encoding rate */
 
-       float fps = e->current_rate ();
+       optional<float> fps = e->current_rate ();
 
-       if (fps == 0) {
+       if (!fps) {
                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 ()) - e->frames_done()) / fps;
+       return (_film->length().frames_round(_film->video_frame_rate()) - e->frames_done()) / *fps;
 }