Some export tidying up.

[dcpomatic.git] / src / lib / encoder.cc

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index e43325f58fde5ad4a7cc4fd97e620c8136ce0991..2d916d47e44c44e1a46bbca71dbda1f7b54a3e94 100644 (file)
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -54,13 +54,12 @@ using boost::weak_ptr;
 using boost::optional;
 using dcp::Data;
 
-int const Encoder::_history_size = 200;
-
 /** @param film Film that we are encoding.
  *  @param writer Writer that we are using.
  */
 Encoder::Encoder (shared_ptr<const Film> film, shared_ptr<Writer> writer)
        : _film (film)
+       , _history (200)
        , _writer (writer)
 {
        servers_list_changed ();
@@ -152,15 +151,7 @@ Encoder::end ()
 float
 Encoder::current_encoding_rate () const
 {
-       boost::mutex::scoped_lock lock (_state_mutex);
-       if (int (_time_history.size()) < _history_size) {
-               return 0;
-       }
-
-       struct timeval now;
-       gettimeofday (&now, 0);
-
-       return _history_size / (seconds (now) - seconds (_time_history.back ()));
+       return _history.rate ();
 }
 
 /** @return Number of video frames that have been queued for encoding */
@@ -178,14 +169,7 @@ Encoder::video_frames_enqueued () const
 void
 Encoder::frame_done ()
 {
-       boost::mutex::scoped_lock lock (_state_mutex);
-
-       struct timeval tv;
-       gettimeofday (&tv, 0);
-       _time_history.push_front (tv);
-       if (int (_time_history.size()) > _history_size) {
-               _time_history.pop_back ();
-       }
+       _history.event ();
 }
 
 /** Called to request encoding of the next video frame in the DCP.  This is called in order,
@@ -414,7 +398,7 @@ Encoder::servers_list_changed ()
 #endif
 
        if (!Config::instance()->only_servers_encode ()) {
-               for (int i = 0; i < Config::instance()->num_local_encoding_threads (); ++i) {
+               for (int i = 0; i < Config::instance()->master_encoding_threads (); ++i) {
                        boost::thread* t = new boost::thread (boost::bind (&Encoder::encoder_thread, this, optional<EncodeServerDescription> ()));
                        _threads.push_back (t);
 #ifdef BOOST_THREAD_PLATFORM_WIN32