summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_transcoder.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-05-09 16:52:26 +0100
committerCarl Hetherington <cth@carlh.net>2017-05-09 16:52:26 +0100
commit78c27b4fa4d23d4a0a64f0398350ec5697d50551 (patch)
tree56c5b733d812745eeadf767a4fd68d8e470c5a9c /src/lib/ffmpeg_transcoder.h
parent6a11232620e0006f6a2b1e8d2b56e56d84229d5c (diff)
Slight tidy up of progress stuff in TranscodeJob.
Diffstat (limited to 'src/lib/ffmpeg_transcoder.h')
-rw-r--r--src/lib/ffmpeg_transcoder.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/ffmpeg_transcoder.h b/src/lib/ffmpeg_transcoder.h
index 02f0bb82e..5380e84b0 100644
--- a/src/lib/ffmpeg_transcoder.h
+++ b/src/lib/ffmpeg_transcoder.h
@@ -32,8 +32,8 @@ public:
void go ();
- float current_encoding_rate () const;
- int video_frames_enqueued () const;
+ float current_rate () const;
+ Frame frames_done () const;
bool finishing () const {
return false;
}
@@ -53,7 +53,7 @@ private:
AVPixelFormat _pixel_format;
mutable boost::mutex _mutex;
- Frame _last_frame;
+ DCPTime _last_time;
EventHistory _history;