Try removing force of single-threaded decoding again.

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

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 02a2d772325bdbd602291f2b2b5c1f26aa631f4f..b12bd0d48710291ce9e2ae8745137e8ac21bf817 100644 (file)
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -31,12 +31,15 @@
 extern "C" {
 #include <libavutil/samplefmt.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 Encoder
  *  @brief Parent class for classes which can encode video and audio frames.
@@ -48,44 +51,49 @@ class Subtitle;
  *  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 Options> o);
+       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;
+       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 s A subtitle that should be on this frame, or 0.
         */
-       virtual void process_video (boost::shared_ptr<Image> i, int f, boost::shared_ptr<Subtitle> s) = 0;
+       void process_video (boost::shared_ptr<Image> i, 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);
+
+       /** 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;
+       
+       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;
 
        /** Mutex for _time_history, _just_skipped and _last_frame */
        mutable boost::mutex _history_mutex;
@@ -97,8 +105,11 @@ 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;
 };
 
 #endif