Various fixes to make audio analysis sort-of work.

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

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 02a2d772325bdbd602291f2b2b5c1f26aa631f4f..3fe707b511e717b38b001788db4a35d601ae8dfd 100644 (file)
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -17,77 +17,80 @@
 
 */
 
-#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"
 
-class FilmState;
-class Options;
 class Image;
-class Log;
-class Subtitle;
+class AudioBuffers;
+class Film;
+class ServerDescription;
+class DCPVideoFrame;
+class EncodedData;
+class Writer;
+class Job;
 
 /** @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
+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<Job>);
+       virtual ~Encoder ();
 
        /** Called to indicate that a processing run is about to begin */
-       virtual void process_begin (int64_t audio_channel_layout, AVSampleFormat audio_sample_format) = 0;
+       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 s A subtitle that should be on this frame, or 0.
+        *  @param same true if i is the same as the last time we were called.
         */
-       virtual void process_video (boost::shared_ptr<Image> i, int f, boost::shared_ptr<Subtitle> s) = 0;
+       void process_video (boost::shared_ptr<const Image> i, bool same, Time);
 
-       /** 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<const AudioBuffers>, Time);
 
        /** Called when a processing run has finished */
-       virtual void process_end () = 0;
+       void process_end ();
 
-       float current_frames_per_second () const;
-       bool skipping () const;
-       int last_frame () const;
+       float current_encoding_rate () const;
+       int video_frames_out () const;
 
-protected:
-       void frame_done (int n);
-       void frame_skipped ();
+private:
        
-       /** FilmState of the film that we are encoding */
-       boost::shared_ptr<const FilmState> _fs;
-       /** Options */
-       boost::shared_ptr<const Options> _opt;
-       /** Log */
-       Log* _log;
-
-       /** Mutex for _time_history, _just_skipped and _last_frame */
+       void frame_done ();
+       
+       void encoder_thread (ServerDescription *);
+       void terminate_threads ();
+
+       /** Film that we are encoding */
+       boost::shared_ptr<const Film> _film;
+       boost::shared_ptr<Job> _job;
+
+       /** Mutex for _time_history and _last_frame */
        mutable boost::mutex _history_mutex;
        /** List of the times of completion of the last _history_size frames;
            first is the most recently completed.
@@ -95,10 +98,18 @@ protected:
        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;
-       /** Index of the last frame to be processed */
-       int _last_frame;
+
+       /** 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;
+       mutable boost::mutex _mutex;
+       boost::condition _condition;
+
+       boost::shared_ptr<Writer> _writer;
 };
 
 #endif