projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Missing include.
[dcpomatic.git]
/
src
/
lib
/
transcode_job.cc
diff --git
a/src/lib/transcode_job.cc
b/src/lib/transcode_job.cc
index 1db37e3708b27748ada7455763a2c753e63e30f6..7fe28d210873abd328b75b212da1154e915731a4 100644
(file)
--- a/
src/lib/transcode_job.cc
+++ b/
src/lib/transcode_job.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-201
5
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
9
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-42,6
+42,7
@@
using std::fixed;
using std::setprecision;
using std::cout;
using boost::shared_ptr;
using std::setprecision;
using std::cout;
using boost::shared_ptr;
+using boost::optional;
using boost::dynamic_pointer_cast;
/** @param film Film to use */
using boost::dynamic_pointer_cast;
/** @param film Film to use */
@@
-51,6
+52,14
@@
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
{
string
TranscodeJob::name () const
{
@@
-79,8
+88,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);
@@
-104,6
+111,9
@@
TranscodeJob::run ()
_encoder.reset ();
_encoder.reset ();
+ set_progress (1);
+ set_state (FINISHED_OK);
+
} catch (...) {
_encoder.reset ();
throw;
} catch (...) {
_encoder.reset ();
throw;
@@
-120,7
+130,8
@@
TranscodeJob::status () const
char buffer[256];
if (finished() || _encoder->finishing()) {
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",
} else {
snprintf (
buffer, sizeof(buffer), "%s; %" PRId64 "/%" PRId64 " frames",
@@
-129,11
+140,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);
}
}
@@
-155,12
+166,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;
}
}