*/
#include "transcode_job.h"
-#include "dcp_transcoder.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 film Film to use */
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
}
void
-TranscodeJob::set_transcoder (shared_ptr<Transcoder> t)
+TranscodeJob::set_encoder (shared_ptr<Encoder> e)
{
- _transcoder = t;
+ _encoder = e;
}
void
gettimeofday (&start, 0);
LOG_GENERAL_NC (N_("Transcode job starting"));
- DCPOMATIC_ASSERT (_transcoder);
- _transcoder->go ();
+ DCPOMATIC_ASSERT (_encoder);
+ _encoder->go ();
set_progress (1);
set_state (FINISHED_OK);
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 (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 (...) {
- _transcoder.reset ();
+ _encoder.reset ();
throw;
}
}
string
TranscodeJob::status () const
{
- if (!_transcoder) {
+ if (!_encoder) {
return Job::status ();
}
char buffer[256];
- if (finished() || _transcoder->finishing()) {
- strncpy (buffer, Job::status().c_str(), 256);
+ if (finished() || _encoder->finishing()) {
+ strncpy (buffer, Job::status().c_str(), 255);
+ buffer[255] = '\0';
} else {
snprintf (
- buffer, sizeof(buffer), "%s; %d/%" PRId64 " frames",
+ buffer, sizeof(buffer), "%s; %" PRId64 "/%" PRId64 " frames",
Job::status().c_str(),
- _transcoder->video_frames_enqueued(),
+ _encoder->frames_done(),
_film->length().frames_round (_film->video_frame_rate ())
);
- float const fps = _transcoder->current_encoding_rate ();
+ float const fps = _encoder->current_rate ();
if (fps) {
char fps_buffer[64];
/// TRANSLATORS: fps here is an abbreviation for frames per second
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;
}