Merge master branch.

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

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 20255cca90d483375cc2998f377ca748d42a2e9e..429b46a18c4f1d60191e2b40585f9abdbda04939 100644 (file)
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -39,7 +39,6 @@ extern "C" {
 #include <libswresample/swresample.h>
 }
 #endif
-#include <sndfile.h>
 #include "util.h"
 #include "video_sink.h"
 #include "audio_sink.h"
@@ -50,6 +49,8 @@ class AudioBuffers;
 class Film;
 class ServerDescription;
 class DCPVideoFrame;
+class EncodedData;
+class Writer;
 
 /** @class Encoder
  *  @brief Encoder to J2K and WAV for DCP.
@@ -61,7 +62,7 @@ class DCPVideoFrame;
 class Encoder : public VideoSink, public AudioSink
 {
 public:
-       Encoder (boost::shared_ptr<const Film> f);
+       Encoder (boost::shared_ptr<Film> f);
        virtual ~Encoder ();
 
        /** Called to indicate that a processing run is about to begin */
@@ -89,15 +90,13 @@ private:
        void frame_done ();
        void frame_skipped ();
        
-       void close_sound_files ();
        void write_audio (boost::shared_ptr<const AudioBuffers> audio);
 
        void encoder_thread (ServerDescription *);
        void terminate_worker_threads ();
-       void link (std::string, std::string) const;
 
        /** Film that we are encoding */
-       boost::shared_ptr<const Film> _film;
+       boost::shared_ptr<Film> _film;
 
        /** Mutex for _time_history, _just_skipped and _last_frame */
        mutable boost::mutex _history_mutex;
@@ -112,32 +111,21 @@ private:
 
        /** Number of video frames received so far */
        SourceFrame _video_frames_in;
-       /** Number of audio frames received so far */
-       int64_t _audio_frames_in;
        /** Number of video frames written for the DCP so far */
        int _video_frames_out;
-       /** Number of audio frames written for the DCP so far */
-       int64_t _audio_frames_out;
 
 #if HAVE_SWRESAMPLE    
        SwrContext* _swr_context;
 #endif
 
-       /** List of links that we need to create when all frames have been processed;
-        *  such that we need to call link (first, second) for each member of this list.
-        *  In other words, `first' is a `real' frame and `second' should be a link to `first'.
-        *  Frames are DCP frames.
-        */
-       std::list<std::pair<int, int> > _links_required;
-
-       std::vector<SNDFILE*> _sound_files;
-
-       boost::optional<int> _last_real_frame;
-       bool _process_end;
-       std::list<boost::shared_ptr<DCPVideoFrame> > _queue;
+       bool _have_a_real_frame;
+       bool _terminate_encoder;
+       std::list<boost::shared_ptr<DCPVideoFrame> > _encode_queue;
        std::list<boost::thread *> _worker_threads;
        mutable boost::mutex _worker_mutex;
        boost::condition _worker_condition;
+
+       boost::shared_ptr<Writer> _writer;
 };
 
 #endif