Re-work again so that there's just one encoder; various tweaks to still-image-with...

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

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 539b2912ce9580c36b6aad8766dbf5e92ee9b871..8ab4479efa18d6bf690b04546cc30b87e188afa6 100644 (file)
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -26,61 +26,73 @@
 
 #include <boost/shared_ptr.hpp>
 #include <boost/thread/mutex.hpp>
+#include <boost/thread/condition.hpp>
+#include <boost/thread.hpp>
 #include <list>
 #include <stdint.h>
+extern "C" {
+#include <libavutil/samplefmt.h>
+}
+#ifdef HAVE_SWRESAMPLE
+extern "C" {
+#include <libswresample/swresample.h>
+}
+#endif
+#include <sndfile.h>
+#include "util.h"
+#include "video_sink.h"
+#include "audio_sink.h"
 
-class FilmState;
-class Options;
+class EncodeOptions;
 class Image;
-class Log;
+class Subtitle;
+class AudioBuffers;
+class Film;
+class ServerDescription;
+class DCPVideoFrame;
 
 /** @class Encoder
- *  @brief Parent class for classes which can encode video and audio frames.
+ *  @brief Encoder to J2K and WAV for DCP.
  *
  *  Video is supplied to process_video as YUV frames, and audio
  *  is supplied as uncompressed PCM in blocks of various sizes.
- *
- *  The subclass is expected to encode the video and/or audio in
- *  some way and write it to disk.
  */
 
-class Encoder
+class Encoder : public VideoSink, public AudioSink
 {
 public:
-       Encoder (boost::shared_ptr<const FilmState> s, boost::shared_ptr<const Options> o, Log* l);
+       Encoder (boost::shared_ptr<const Film> f, boost::shared_ptr<const EncodeOptions> o);
+       virtual ~Encoder ();
 
        /** Called to indicate that a processing run is about to begin */
-       virtual void process_begin () = 0;
+       virtual void process_begin ();
 
-       /** Called with a frame of video.
+       /** Call with a frame of video.
         *  @param i Video frame image.
-        *  @param f Frame number within the film.
+        *  @param same true if i is the same as the last time we were called.
+        *  @param s A subtitle that should be on this frame, or 0.
         */
-       virtual void process_video (boost::shared_ptr<Image> i, int f) = 0;
+       void process_video (boost::shared_ptr<Image> i, bool same, boost::shared_ptr<Subtitle> s);
 
-       /** Called with some audio data.
-        *  @param d Data.
-        *  @param s Size of data (in bytes)
-        */
-       virtual void process_audio (uint8_t* d, int s) = 0;
+       /** Call with some audio data */
+       void process_audio (boost::shared_ptr<AudioBuffers>);
 
        /** Called when a processing run has finished */
-       virtual void process_end () = 0;
+       virtual void process_end ();
 
        float current_frames_per_second () const;
        bool skipping () const;
-       int last_frame () const;
+       SourceFrame video_frame () const;
 
 protected:
-       void frame_done (int n);
+       
+       void frame_done ();
        void frame_skipped ();
        
-       /** FilmState of the film that we are encoding */
-       boost::shared_ptr<const FilmState> _fs;
+       /** Film that we are encoding */
+       boost::shared_ptr<const Film> _film;
        /** Options */
-       boost::shared_ptr<const Options> _opt;
-       /** Log */
-       Log* _log;
+       boost::shared_ptr<const EncodeOptions> _opt;
 
        /** Mutex for _time_history, _just_skipped and _last_frame */
        mutable boost::mutex _history_mutex;
@@ -92,8 +104,33 @@ protected:
        static int const _history_size;
        /** true if the last frame we processed was skipped (because it was already done) */
        bool _just_skipped;
-       /** Index of the last frame to be processed */
-       int _last_frame;
+
+       /** Number of video frames received so far */
+       SourceFrame _video_frame;
+       /** Number of audio frames received so far */
+       int64_t _audio_frame;
+
+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;
+
+#if HAVE_SWRESAMPLE    
+       SwrContext* _swr_context;
+#endif 
+
+       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;
+       std::list<boost::thread *> _worker_threads;
+       mutable boost::mutex _worker_mutex;
+       boost::condition _worker_condition;
 };
 
 #endif