Rename Server -> EncodeServer, ServerFinder -> EncodeServerFinder, ServerDescription...

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

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 12f1e15ffe87b5d1d94cf9d19bdd8cab143fb8dc..20f2951b64cbb63ab4d1020ed1a60cba99bb5b6d 100644 (file)
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -26,6 +26,7 @@
 
 #include "util.h"
 #include "cross.h"
+#include "exception_store.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition.hpp>
@@ -36,7 +37,7 @@
 #include <stdint.h>
 
 class Film;
-class ServerDescription;
+class EncodeServerDescription;
 class DCPVideo;
 class Writer;
 class Job;
@@ -52,16 +53,16 @@ class PlayerVideo;
 class Encoder : public boost::noncopyable, public ExceptionStore
 {
 public:
-       Encoder (boost::shared_ptr<const Film>, boost::weak_ptr<Job>, boost::shared_ptr<Writer>);
+       Encoder (boost::shared_ptr<const Film>, boost::shared_ptr<Writer>);
        virtual ~Encoder ();
 
        /** Called to indicate that a processing run is about to begin */
        void begin ();
 
-       /** Call with a frame of video.
-        *  @param f Video frame.
+       /** Called to pass in zero or more bits of video to be encoded
+        *  as the next DCP frame.
         */
-       void enqueue (boost::shared_ptr<PlayerVideo> f);
+       void encode (std::list<boost::shared_ptr<PlayerVideo> > f);
 
        /** Called when a processing run has finished */
        void end ();
@@ -71,17 +72,17 @@ public:
 
 private:
 
+       void enqueue (boost::shared_ptr<PlayerVideo> f);
        void frame_done ();
 
-       void encoder_thread (boost::optional<ServerDescription>);
+       void encoder_thread (boost::optional<EncodeServerDescription>);
        void terminate_threads ();
        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.
@@ -89,16 +90,17 @@ 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;
+       /** Current DCP frame index */
+       Frame _position;
+
+       /* 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 */