Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 47eef823bc6705c9c4ae38429bd09da742b0b58c..76c87a9f7ad2ea57468a58408ea3ca663821340b 100644 (file)
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -20,28 +20,22 @@
 #ifndef DCPOMATIC_ENCODER_H
 #define DCPOMATIC_ENCODER_H
 
-/** @file src/encoder.h
+/** @file  src/encoder.h
  *  @brief Encoder class.
  */
 
 #include "util.h"
-#include "config.h"
 #include "cross.h"
-#include "exceptions.h"
-extern "C" {
-#include <libavutil/samplefmt.h>
-#include <libswresample/swresample.h>
-}
+#include "exception_store.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition.hpp>
 #include <boost/thread.hpp>
 #include <boost/optional.hpp>
+#include <boost/signals2.hpp>
 #include <list>
 #include <stdint.h>
 
-class Image;
-class AudioBuffers;
 class Film;
 class ServerDescription;
 class DCPVideo;
@@ -82,14 +76,13 @@ private:
 
        void encoder_thread (boost::optional<ServerDescription>);
        void terminate_threads ();
-       void add_worker_threads (ServerDescription);
        void servers_list_changed ();
 
        /** Film that we are encoding */
        boost::shared_ptr<const Film> _film;
        boost::weak_ptr<Job> _job;
 
-       /** Mutex for _time_history and _last_frame */
+       /** Mutex for _time_history and _video_frames_enqueued */
        mutable boost::mutex _state_mutex;
        /** List of the times of completion of the last _history_size frames;
            first is the most recently completed.
@@ -97,16 +90,19 @@ private:
        std::list<struct timeval> _time_history;
        /** Number of frames that we should keep history for */
        static int const _history_size;
-
        /** Number of video frames enqueued so far */
        int _video_frames_enqueued;
        bool _left_done;
        bool _right_done;
 
-       bool _terminate;
-       std::list<boost::shared_ptr<DCPVideo> > _queue;
+       /* XXX: probably should be atomic */
+       bool _terminate_enqueue;
+       bool _terminate_encoding;
+       /** Mutex for _threads */
+       mutable boost::mutex _threads_mutex;
        std::list<boost::thread *> _threads;
-       mutable boost::mutex _mutex;
+       mutable boost::mutex _queue_mutex;
+       std::list<boost::shared_ptr<DCPVideo> > _queue;
        /** condition to manage thread wakeups when we have nothing to do */
        boost::condition _empty_condition;
        /** condition to manage thread wakeups when we have too much to do */