summaryrefslogtreecommitdiff
path: root/src/lib/encoder.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-01-23 20:49:26 +0000
committerCarl Hetherington <cth@carlh.net>2013-01-23 20:49:26 +0000
commit0b760c0526b0b9d13def519ab8afba1e511d8111 (patch)
tree3be59118ea7e60ded5527b4ba653143fad1fa166 /src/lib/encoder.h
parent420adb1fd2910fd24eb84be98169afc209f76a0e (diff)
Try to fix up paths for video MXFs, hashes and temporarily-stored frames.
Diffstat (limited to 'src/lib/encoder.h')
-rw-r--r--src/lib/encoder.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 429b46a18..8b02f7004 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -82,13 +82,11 @@ public:
virtual void process_end ();
float current_frames_per_second () const;
- bool skipping () const;
int video_frames_out () const;
private:
void frame_done ();
- void frame_skipped ();
void write_audio (boost::shared_ptr<const AudioBuffers> audio);
@@ -98,7 +96,7 @@ private:
/** Film that we are encoding */
boost::shared_ptr<Film> _film;
- /** Mutex for _time_history, _just_skipped and _last_frame */
+ /** Mutex for _time_history and _last_frame */
mutable boost::mutex _history_mutex;
/** List of the times of completion of the last _history_size frames;
first is the most recently completed.
@@ -106,8 +104,6 @@ private:
std::list<struct timeval> _time_history;
/** Number of frames that we should keep history for */
static int const _history_size;
- /** true if the last frame we processed was skipped (because it was already done) */
- bool _just_skipped;
/** Number of video frames received so far */
SourceFrame _video_frames_in;