Merge master; fix crash on new film.

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

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 8b02f70041af349d5e95dbd4a855c15c151a493e..f95d42661b1ed5d50442beed89c7238fa614f675 100644 (file)
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -17,11 +17,11 @@
 
 */
 
-#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>
@@ -73,25 +73,23 @@ public:
         *  @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<Image> i, bool same, boost::shared_ptr<Subtitle> s);
+       void process_video (boost::shared_ptr<const Image> i, bool same, boost::shared_ptr<Subtitle> s);
 
        /** 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;
+       float current_encoding_rate () const;
        int video_frames_out () const;
 
 private:
        
        void frame_done ();
        
-       void write_audio (boost::shared_ptr<const AudioBuffers> audio);
-
        void encoder_thread (ServerDescription *);
-       void terminate_worker_threads ();
+       void terminate_threads ();
 
        /** Film that we are encoding */
        boost::shared_ptr<Film> _film;
@@ -106,7 +104,7 @@ private:
        static int const _history_size;
 
        /** Number of video frames received so far */
-       SourceFrame _video_frames_in;
+       ContentVideoFrame _video_frames_in;
        /** Number of video frames written for the DCP so far */
        int _video_frames_out;
 
@@ -115,11 +113,11 @@ private:
 #endif
 
        bool _have_a_real_frame;
-       bool _terminate_encoder;
-       std::list<boost::shared_ptr<DCPVideoFrame> > _encode_queue;
-       std::list<boost::thread *> _worker_threads;
-       mutable boost::mutex _worker_mutex;
-       boost::condition _worker_condition;
+       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;
 };