Merge master.

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

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index e9b30df9e558cbf60c00f54e612869d7e2887b09..6c465f816773d12635f1b11dd020a807c7a1b756 100644 (file)
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -36,6 +36,8 @@ extern "C" {
 #include <libswresample/swresample.h>
 }
 #include "util.h"
+#include "config.h"
+#include "cross.h"
 
 class Image;
 class AudioBuffers;
@@ -45,6 +47,8 @@ class DCPVideoFrame;
 class EncodedData;
 class Writer;
 class Job;
+class ServerFinder;
+class DCPVideo;
 
 /** @class Encoder
  *  @brief Encoder to J2K and WAV for DCP.
@@ -53,20 +57,19 @@ class Job;
  *  is supplied as uncompressed PCM in blocks of various sizes.
  */
 
-class Encoder : public boost::noncopyable
+class Encoder : public boost::noncopyable, public ExceptionStore
 {
 public:
-       Encoder (boost::shared_ptr<const Film> f, boost::shared_ptr<Job>);
+       Encoder (boost::shared_ptr<const Film> f, boost::weak_ptr<Job>);
        virtual ~Encoder ();
 
        /** Called to indicate that a processing run is about to begin */
        void process_begin ();
 
        /** Call with a frame of video.
-        *  @param i Video frame image.
-        *  @param same true if i is the same as the last time we were called.
+        *  @param f Video frame.
         */
-       void process_video (boost::shared_ptr<const Image> i, Eyes eyes, ColourConversion, bool same);
+       void process_video (boost::shared_ptr<DCPVideo> f);
 
        /** Call with some audio data */
        void process_audio (boost::shared_ptr<const AudioBuffers>);
@@ -77,28 +80,20 @@ 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 ();
        
        void encoder_thread (boost::optional<ServerDescription>);
        void terminate_threads ();
+       void add_worker_threads (ServerDescription);
+       void server_found (ServerDescription);
 
        /** Film that we are encoding */
        boost::shared_ptr<const Film> _film;
-       boost::shared_ptr<Job> _job;
+       boost::weak_ptr<Job> _job;
 
-       /** Mutex for _time_history, _last_frame and _state */
+       /** Mutex for _time_history and _last_frame */
        mutable boost::mutex _state_mutex;
        /** List of the times of completion of the last _history_size frames;
            first is the most recently completed.
@@ -109,9 +104,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;
        std::list<boost::shared_ptr<DCPVideoFrame> > _queue;
        std::list<boost::thread *> _threads;
@@ -119,6 +112,7 @@ private:
        boost::condition _condition;
 
        boost::shared_ptr<Writer> _writer;
+       Waker _waker;
 };
 
 #endif