From 9e124e8ce2eb7a9faeb91b33169ab1ae4912afb0 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 29 Aug 2013 14:25:31 +0100 Subject: Better progress reporting during MXF hashing (#184). --- src/lib/encoder.h | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'src/lib/encoder.h') diff --git a/src/lib/encoder.h b/src/lib/encoder.h index 44134e568..e9b30df9e 100644 --- a/src/lib/encoder.h +++ b/src/lib/encoder.h @@ -77,6 +77,16 @@ public: float current_encoding_rate () const; int video_frames_out () const; + enum State { + TRANSCODING, + HASHING + }; + + State state () const { + boost::mutex::scoped_lock lm (_state_mutex); + return _state; + } + private: void frame_done (); @@ -88,8 +98,8 @@ private: boost::shared_ptr _film; boost::shared_ptr _job; - /** Mutex for _time_history and _last_frame */ - mutable boost::mutex _history_mutex; + /** Mutex for _time_history, _last_frame and _state */ + mutable boost::mutex _state_mutex; /** List of the times of completion of the last _history_size frames; first is the most recently completed. */ @@ -99,6 +109,7 @@ private: /** Number of video frames written for the DCP so far */ int _video_frames_out; + State _state; bool _have_a_real_frame[EYES_COUNT]; bool _terminate; -- cgit v1.2.3