projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
std::shared_ptr
[dcpomatic.git]
/
src
/
lib
/
transcode_job.cc
diff --git
a/src/lib/transcode_job.cc
b/src/lib/transcode_job.cc
index 981816fd528f24edc19e071cf37526c88f37b714..48a2c8114960daa64d69e725becc60ffdd3cbd5c 100644
(file)
--- a/
src/lib/transcode_job.cc
+++ b/
src/lib/transcode_job.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-20
19
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-20
20
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-22,6
+22,7
@@
* @brief A job which transcodes from one format to another.
*/
* @brief A job which transcodes from one format to another.
*/
+#include "config.h"
#include "transcode_job.h"
#include "dcp_encoder.h"
#include "upload_job.h"
#include "transcode_job.h"
#include "dcp_encoder.h"
#include "upload_job.h"
@@
-41,8
+42,9
@@
using std::string;
using std::fixed;
using std::setprecision;
using std::cout;
using std::fixed;
using std::setprecision;
using std::cout;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using boost::optional;
+using std::dynamic_pointer_cast;
/** @param film Film to use */
TranscodeJob::TranscodeJob (shared_ptr<const Film> film)
/** @param film Film to use */
TranscodeJob::TranscodeJob (shared_ptr<const Film> film)
@@
-53,9
+55,6
@@
TranscodeJob::TranscodeJob (shared_ptr<const Film> film)
TranscodeJob::~TranscodeJob ()
{
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 ();
}
stop_thread ();
}
@@
-87,8
+86,6
@@
TranscodeJob::run ()
DCPOMATIC_ASSERT (_encoder);
_encoder->go ();
DCPOMATIC_ASSERT (_encoder);
_encoder->go ();
- set_progress (1);
- set_state (FINISHED_OK);
struct timeval finish;
gettimeofday (&finish, 0);
struct timeval finish;
gettimeofday (&finish, 0);
@@
-105,13
+102,16
@@
TranscodeJob::run ()
}
/* XXX: this shouldn't be here */
}
/* XXX: this shouldn't be here */
- if (
_film
->upload_after_make_dcp() && dynamic_pointer_cast<DCPEncoder>(_encoder)) {
+ if (
Config::instance()
->upload_after_make_dcp() && dynamic_pointer_cast<DCPEncoder>(_encoder)) {
shared_ptr<Job> job (new UploadJob (_film));
JobManager::instance()->add (job);
}
_encoder.reset ();
shared_ptr<Job> job (new UploadJob (_film));
JobManager::instance()->add (job);
}
_encoder.reset ();
+ set_progress (1);
+ set_state (FINISHED_OK);
+
} catch (...) {
_encoder.reset ();
throw;
} catch (...) {
_encoder.reset ();
throw;
@@
-138,11
+138,11
@@
TranscodeJob::status () const
_film->length().frames_round (_film->video_frame_rate ())
);
_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
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);
}
}
strncat (buffer, fps_buffer, strlen(buffer) - 1);
}
}
@@
-164,12
+164,12
@@
TranscodeJob::remaining_time () const
/* We're encoding so guess based on the current encoding rate */
/* 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 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;
}
}