Merge master.

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

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 3fe707b511e717b38b001788db4a35d601ae8dfd..ac1d74c57b39af3aa449e43fd628651108701823 100644 (file)
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -36,8 +36,8 @@ extern "C" {
 #include <libswresample/swresample.h>
 }
 #include "util.h"
-#include "video_sink.h"
-#include "audio_sink.h"
+#include "config.h"
+#include "cross.h"
 
 class Image;
 class AudioBuffers;
@@ -47,6 +47,8 @@ class DCPVideoFrame;
 class EncodedData;
 class Writer;
 class Job;
+class ServerFinder;
+class PlayerVideoFrame;
 
 /** @class Encoder
  *  @brief Encoder to J2K and WAV for DCP.
@@ -55,23 +57,22 @@ class Job;
  *  is supplied as uncompressed PCM in blocks of various sizes.
  */
 
-class Encoder : public VideoSink, public AudioSink
+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, bool same, Time);
+       void process_video (boost::shared_ptr<PlayerVideoFrame> f);
 
        /** Call with some audio data */
-       void process_audio (boost::shared_ptr<const AudioBuffers>, Time);
+       void process_audio (boost::shared_ptr<const AudioBuffers>);
 
        /** Called when a processing run has finished */
        void process_end ();
@@ -83,15 +84,17 @@ private:
        
        void frame_done ();
        
-       void encoder_thread (ServerDescription *);
+       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 and _last_frame */
-       mutable boost::mutex _history_mutex;
+       mutable boost::mutex _state_mutex;
        /** List of the times of completion of the last _history_size frames;
            first is the most recently completed.
        */
@@ -102,7 +105,6 @@ private:
        /** Number of video frames written for the DCP so far */
        int _video_frames_out;
 
-       bool _have_a_real_frame;
        bool _terminate;
        std::list<boost::shared_ptr<DCPVideoFrame> > _queue;
        std::list<boost::thread *> _threads;
@@ -110,6 +112,7 @@ private:
        boost::condition _condition;
 
        boost::shared_ptr<Writer> _writer;
+       Waker _waker;
 };
 
 #endif