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 a277aca51d85f387926485a50ba7593e2a5041e2..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>
@@ -39,7 +39,6 @@ extern "C" {
 #include <libswresample/swresample.h>
 }
 #endif
-#include <sndfile.h>
 #include "util.h"
 #include "video_sink.h"
 #include "audio_sink.h"
@@ -63,7 +62,7 @@ class Writer;
 class Encoder : public VideoSink, public AudioSink
 {
 public:
-       Encoder (boost::shared_ptr<const Film> f);
+       Encoder (boost::shared_ptr<Film> f);
        virtual ~Encoder ();
 
        /** Called to indicate that a processing run is about to begin */
@@ -74,33 +73,28 @@ 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;
-       bool skipping () const;
+       float current_encoding_rate () const;
        int video_frames_out () const;
 
 private:
        
        void frame_done ();
-       void frame_skipped ();
        
-       void close_sound_files ();
-       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<const Film> _film;
+       boost::shared_ptr<Film> _film;
 
-       /** Mutex for _time_history, _just_skipped and _last_frame */
+       /** 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.
@@ -108,30 +102,22 @@ private:
        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;
 
        /** Number of video frames received so far */
-       SourceFrame _video_frames_in;
-       /** Number of audio frames received so far */
-       int64_t _audio_frames_in;
+       ContentVideoFrame _video_frames_in;
        /** Number of video frames written for the DCP so far */
        int _video_frames_out;
-       /** Number of audio frames written for the DCP so far */
-       int64_t _audio_frames_out;
 
 #if HAVE_SWRESAMPLE    
        SwrContext* _swr_context;
 #endif
 
-       std::vector<SNDFILE*> _sound_files;
-
        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;
 };