projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
transcode_job.cc
diff --git
a/src/lib/transcode_job.cc
b/src/lib/transcode_job.cc
index 289259369d028652aa2fc684f7aabc4997c30971..46fc97fb31b74bdf14f6093dd0d973e34fa78709 100644
(file)
--- a/
src/lib/transcode_job.cc
+++ b/
src/lib/transcode_job.cc
@@
-100,17
+100,20
@@
TranscodeJob::status () const
int
TranscodeJob::remaining_time () const
{
int
TranscodeJob::remaining_time () const
{
- if (!_transcoder) {
+ /* _transcoder might be destroyed by the job-runner thread */
+ shared_ptr<Transcoder> t = _transcoder;
+
+ if (!t) {
return 0;
}
return 0;
}
- float fps =
_transcoder
->current_encoding_rate ();
+ float fps =
t
->current_encoding_rate ();
if (fps == 0) {
return 0;
}
/* Compute approximate proposed length here, as it's only here that we need it */
if (fps == 0) {
return 0;
}
/* Compute approximate proposed length here, as it's only here that we need it */
- VideoFrame const left = _film->time_to_video_frames (_film->length ()) -
_transcoder
->video_frames_out();
+ VideoFrame const left = _film->time_to_video_frames (_film->length ()) -
t
->video_frames_out();
return left / fps;
}
return left / fps;
}