Another try at sorting out the thorny question of timing.

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

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 6cf5540c598a81e879f4a1f88d9845ad43785cfe..b5a641f50d40492caa008115cf294ea4ec084de5 100644 (file)
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -33,18 +33,11 @@
 #include <stdint.h>
 extern "C" {
 #include <libavutil/samplefmt.h>
-}
-#ifdef HAVE_SWRESAMPLE
-extern "C" {
 #include <libswresample/swresample.h>
 }
-#endif
 #include "util.h"
-#include "video_sink.h"
-#include "audio_sink.h"
 
 class Image;
-class Subtitle;
 class AudioBuffers;
 class Film;
 class ServerDescription;
@@ -56,14 +49,14 @@ class Job;
 /** @class Encoder
  *  @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.
  */
 
-class Encoder : public VideoSink, public AudioSink
+class Encoder
 {
 public:
-       Encoder (boost::shared_ptr<Film> f, boost::shared_ptr<Job>);
+       Encoder (boost::shared_ptr<const Film> f, boost::shared_ptr<Job>);
        virtual ~Encoder ();
 
        /** Called to indicate that a processing run is about to begin */
@@ -72,9 +65,8 @@ public:
        /** Call with a frame of video.
         *  @param i Video frame image.
         *  @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.
         */
-       void process_video (boost::shared_ptr<const Image> i, bool same, boost::shared_ptr<Subtitle> s);
+       void process_video (boost::shared_ptr<const Image> i, bool same);
 
        /** Call with some audio data */
        void process_audio (boost::shared_ptr<const AudioBuffers>);
@@ -93,7 +85,7 @@ private:
        void terminate_threads ();
 
        /** Film that we are encoding */
-       boost::shared_ptr<Film> _film;
+       boost::shared_ptr<const Film> _film;
        boost::shared_ptr<Job> _job;
 
        /** Mutex for _time_history and _last_frame */
@@ -105,15 +97,9 @@ private:
        /** Number of frames that we should keep history for */
        static int const _history_size;
 
-       /** Number of video frames received so far */
-       ContentVideoFrame _video_frames_in;
        /** Number of video frames written for the DCP so far */
        int _video_frames_out;
 
-#if HAVE_SWRESAMPLE    
-       SwrContext* _swr_context;
-#endif
-
        bool _have_a_real_frame;
        bool _terminate;
        std::list<boost::shared_ptr<DCPVideoFrame> > _queue;