Make terminate_threads() less likely to leave _threads containing invalid pointers.
[dcpomatic.git] / src / lib / transcode_job.cc
index 4eb2b1d290d6c6ed7d8c29adc7de2cd9c1e46f49..1db37e3708b27748ada7455763a2c753e63e30f6 100644 (file)
  */
 
 #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 "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::dynamic_pointer_cast;
 
-/** @param s Film to use.
- */
+/** @param film Film to use */
 TranscodeJob::TranscodeJob (shared_ptr<const Film> film)
        : Job (film)
 {
@@ -55,7 +54,7 @@ TranscodeJob::TranscodeJob (shared_ptr<const Film> film)
 string
 TranscodeJob::name () const
 {
-       return String::compose (_("Transcode %1"), _film->name());
+       return String::compose (_("Transcoding %1"), _film->name());
 }
 
 string
@@ -64,6 +63,12 @@ TranscodeJob::json_name () const
        return N_("transcode");
 }
 
+void
+TranscodeJob::set_encoder (shared_ptr<Encoder> e)
+{
+       _encoder = e;
+}
+
 void
 TranscodeJob::run ()
 {
@@ -72,8 +77,8 @@ TranscodeJob::run ()
                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);
 
@@ -82,19 +87,25 @@ TranscodeJob::run ()
 
                float fps = 0;
                if (finish.tv_sec != start.tv_sec) {
-                       fps = _transcoder->video_frames_enqueued() / (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);
-               _transcoder.reset ();
 
-               if (_film->upload_after_make_dcp ()) {
+               if (dynamic_pointer_cast<DCPEncoder>(_encoder)) {
+                       Analytics::instance()->successful_dcp_encode();
+               }
+
+               /* XXX: this shouldn't be here */
+               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 (...) {
-               _transcoder.reset ();
+               _encoder.reset ();
                throw;
        }
 }
@@ -102,27 +113,29 @@ TranscodeJob::run ()
 string
 TranscodeJob::status () const
 {
-       if (!_transcoder) {
+       if (!_encoder) {
                return Job::status ();
        }
 
-       float const fps = _transcoder->current_encoding_rate ();
-       if (fps == 0) {
-               return Job::status ();
-       }
 
        char buffer[256];
-       if (finished() || _transcoder->finishing()) {
+       if (finished() || _encoder->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",
+                       buffer, sizeof(buffer), "%s; %" PRId64 "/%" PRId64 " frames",
                        Job::status().c_str(),
-                       _transcoder->video_frames_enqueued(),
-                       _film->length().frames_round (_film->video_frame_rate ()),
-                       fps
+                       _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 buffer;
@@ -132,22 +145,22 @@ TranscodeJob::status () const
 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 || t->finishing()) {
+       if (!e || e->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 ();
+       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_enqueued()) / fps;
+       return (_film->length().frames_round (_film->video_frame_rate ()) - e->frames_done()) / fps;
 }