Merge master.

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

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 68a5f6139311ef81672dde9f7237fc77bfac23a4..6c465f816773d12635f1b11dd020a807c7a1b756 100644 (file)
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -17,98 +17,102 @@
 
 */
 
-#ifndef DVDOMATIC_ENCODER_H
-#define DVDOMATIC_ENCODER_H
+#ifndef DCPOMATIC_ENCODER_H
+#define DCPOMATIC_ENCODER_H
 
 /** @file src/encoder.h
- *  @brief Parent class for classes which can encode video and audio frames.
+ *  @brief Encoder to J2K and WAV for DCP.
  */
 
 #include <boost/shared_ptr.hpp>
 #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" {
 #include <libavutil/samplefmt.h>
+#include <libswresample/swresample.h>
 }
 #include "util.h"
-#include "video_sink.h"
-#include "audio_sink.h"
+#include "config.h"
+#include "cross.h"
 
-class Options;
 class Image;
-class Subtitle;
 class AudioBuffers;
 class Film;
+class ServerDescription;
+class DCPVideoFrame;
+class EncodedData;
+class Writer;
+class Job;
+class ServerFinder;
+class DCPVideo;
 
 /** @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
+ *  Video is supplied to process_video as RGB 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 : public VideoSink, public AudioSink
+class Encoder : public boost::noncopyable, public ExceptionStore
 {
 public:
-       Encoder (boost::shared_ptr<const Film> f, boost::shared_ptr<const Options> o);
+       Encoder (boost::shared_ptr<const Film> f, boost::weak_ptr<Job>);
+       virtual ~Encoder ();
 
        /** Called to indicate that a processing run is about to begin */
-       virtual void process_begin () {}
+       void process_begin ();
 
        /** Call with a frame of video.
-        *  @param i Video frame image.
-        *  @param s A subtitle that should be on this frame, or 0.
+        *  @param f Video frame.
         */
-       void process_video (boost::shared_ptr<Image> i, boost::shared_ptr<Subtitle> s);
+       void process_video (boost::shared_ptr<DCPVideo> f);
 
        /** Call with some audio data */
-       void process_audio (boost::shared_ptr<AudioBuffers>);
+       void process_audio (boost::shared_ptr<const AudioBuffers>);
 
        /** Called when a processing run has finished */
-       virtual void process_end () {}
-
-       float current_frames_per_second () const;
-       bool skipping () const;
-       SourceFrame video_frame () const;
+       void process_end ();
 
-protected:
+       float current_encoding_rate () const;
+       int video_frames_out () const;
 
-       /** Called with a frame of video.
-        *  @param i Video frame image.
-        *  @param s A subtitle that should be on this frame, or 0.
-        */
-       virtual void do_process_video (boost::shared_ptr<Image> i, boost::shared_ptr<Subtitle> s) = 0;
-       
-       /** Called with some audio data */
-       virtual void do_process_audio (boost::shared_ptr<AudioBuffers>) = 0;
+private:
        
        void frame_done ();
-       void frame_skipped ();
        
+       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;
-       /** Options */
-       boost::shared_ptr<const Options> _opt;
+       boost::weak_ptr<Job> _job;
 
-       /** Mutex for _time_history, _just_skipped and _last_frame */
-       mutable boost::mutex _history_mutex;
+       /** 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.
        */
        std::list<struct timeval> _time_history;
        /** Number of frames that we should keep history for */
        static int const _history_size;
-       /** true if the last frame we processed was skipped (because it was already done) */
-       bool _just_skipped;
 
-       /** Number of video frames received so far */
-       SourceFrame _video_frame;
-       /** Number of audio frames received so far */
-       int64_t _audio_frame;
+       /** Number of video frames written for the DCP so far */
+       int _video_frames_out;
+
+       bool _terminate;
+       std::list<boost::shared_ptr<DCPVideoFrame> > _queue;
+       std::list<boost::thread *> _threads;
+       mutable boost::mutex _mutex;
+       boost::condition _condition;
+
+       boost::shared_ptr<Writer> _writer;
+       Waker _waker;
 };
 
 #endif