Move SRC (badly) to AudioDecoder.

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

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index f95d42661b1ed5d50442beed89c7238fa614f675..cce26efc8f06689fb6fb88f56c27e0eafc34a98f 100644 (file)
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -33,12 +33,8 @@
 #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"
@@ -51,6 +47,7 @@ class ServerDescription;
 class DCPVideoFrame;
 class EncodedData;
 class Writer;
+class Job;
 
 /** @class Encoder
  *  @brief Encoder to J2K and WAV for DCP.
@@ -62,11 +59,11 @@ class Writer;
 class Encoder : public VideoSink, public AudioSink
 {
 public:
-       Encoder (boost::shared_ptr<Film> f);
+       Encoder (boost::shared_ptr<Film> f, boost::shared_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.
@@ -79,7 +76,7 @@ public:
        void process_audio (boost::shared_ptr<const AudioBuffers>);
 
        /** Called when a processing run has finished */
-       virtual void process_end ();
+       void process_end ();
 
        float current_encoding_rate () const;
        int video_frames_out () const;
@@ -93,6 +90,7 @@ private:
 
        /** Film that we are encoding */
        boost::shared_ptr<Film> _film;
+       boost::shared_ptr<Job> _job;
 
        /** Mutex for _time_history and _last_frame */
        mutable boost::mutex _history_mutex;
@@ -108,10 +106,6 @@ private:
        /** 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;