summaryrefslogtreecommitdiff
path: root/src/lib/transcode_job.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-03-31 15:09:49 +0100
committerCarl Hetherington <cth@carlh.net>2013-03-31 15:09:49 +0100
commit127672223cca569986e35c91265e269ed5a6561c (patch)
tree853793c1b929d4c38ebdf5456808e466083989b7 /src/lib/transcode_job.cc
parented78fd3d138114185e43edf81ffe91db17377da0 (diff)
Runs.
Diffstat (limited to 'src/lib/transcode_job.cc')
-rw-r--r--src/lib/transcode_job.cc19
1 files changed, 12 insertions, 7 deletions
diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 234ebe051..f8810975b 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -62,8 +62,7 @@ TranscodeJob::run ()
_film->log()->log (N_("Transcode job starting"));
_film->log()->log (String::compose (N_("Audio delay is %1ms"), _film->audio_delay()));
- _encoder.reset (new Encoder (_film));
- Transcoder w (_film, _decode_opt, this, _encoder);
+ Transcoder w (_film, _decode_opt, shared_from_this ());
w.go ();
set_progress (1);
set_state (FINISHED_OK);
@@ -83,11 +82,13 @@ TranscodeJob::run ()
string
TranscodeJob::status () const
{
- if (!_encoder) {
- return _("0%");
- }
+// if (!_encoder) {
+// return _("0%");
+// }
- float const fps = _encoder->current_frames_per_second ();
+ /* XXX */
+// float const fps = _encoder->current_frames_per_second ();
+ float const fps = 0;
if (fps == 0) {
return Job::status ();
}
@@ -106,12 +107,15 @@ TranscodeJob::status () const
int
TranscodeJob::remaining_time () const
{
+ return 0;
+#if 0
+ XXX
float fps = _encoder->current_frames_per_second ();
if (fps == 0) {
return 0;
}
- if (!_film->length()) {
+ if (!_video->length()) {
return 0;
}
@@ -126,4 +130,5 @@ TranscodeJob::remaining_time () const
/* We assume that dcp_length() is valid, if it is set */
int const left = length - _encoder->video_frames_out();
return left / fps;
+#endif
}