Merge writer-thread with original which was time-cleanup.

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

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 8ab4479efa18d6bf690b04546cc30b87e188afa6..96e7a1d25e08742597da886b84e0346c89de1caf 100644 (file)
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -28,6 +28,7 @@
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition.hpp>
 #include <boost/thread.hpp>
+#include <boost/optional.hpp>
 #include <list>
 #include <stdint.h>
 extern "C" {
@@ -43,13 +44,13 @@ extern "C" {
 #include "video_sink.h"
 #include "audio_sink.h"
 
-class EncodeOptions;
 class Image;
 class Subtitle;
 class AudioBuffers;
 class Film;
 class ServerDescription;
 class DCPVideoFrame;
+class EncodedData;
 
 /** @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, boost::shared_ptr<const EncodeOptions> o);
+       Encoder (boost::shared_ptr<const Film> f);
        virtual ~Encoder ();
 
        /** Called to indicate that a processing run is about to begin */
@@ -82,17 +83,22 @@ public:
 
        float current_frames_per_second () const;
        bool skipping () const;
-       SourceFrame video_frame () const;
+       int video_frames_out () const;
 
-protected:
+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;
-       /** Options */
-       boost::shared_ptr<const EncodeOptions> _opt;
 
        /** Mutex for _time_history, _just_skipped and _last_frame */
        mutable boost::mutex _history_mutex;
@@ -106,31 +112,42 @@ protected:
        bool _just_skipped;
 
        /** Number of video frames received so far */
-       SourceFrame _video_frame;
+       SourceFrame _video_frames_in;
        /** Number of audio frames received so far */
-       int64_t _audio_frame;
+       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;
 
-private:
-       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;
+       void writer_thread ();
+       void terminate_writer_thread ();
 
 #if HAVE_SWRESAMPLE    
        SwrContext* _swr_context;
-#endif 
+#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;
-       int64_t _audio_frames_written;
 
        boost::optional<int> _last_real_frame;
-       bool _process_end;
-       std::list<boost::shared_ptr<DCPVideoFrame> > _queue;
+       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::thread* _writer_thread;
+       bool _terminate_writer;
+       std::list<std::pair<boost::shared_ptr<EncodedData>, int> > _write_queue;
+       mutable boost::mutex _writer_mutex;
+       boost::condition _writer_condition;
 };
 
 #endif