Try to fix errors when starting DoM on a machine with no config.xml.

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

diff --git a/src/lib/ffmpeg_encoder.h b/src/lib/ffmpeg_encoder.h
index c7929c54fb6fd5670eee806fef63c174cffa3257..5e6dcecf75d1ee556314d9ff8cddea1f49d12752 100644 (file)
--- a/src/lib/ffmpeg_encoder.h
+++ b/src/lib/ffmpeg_encoder.h
@@ -23,10 +23,14 @@
 
 #include "encoder.h"
 #include "event_history.h"
+#include "audio_mapping.h"
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 }
+#include <boost/thread/condition.hpp>
+
+class Butler;
 
 class FFmpegEncoder : public Encoder
 {
@@ -37,7 +41,7 @@ public:
                FORMAT_H264
        };
 
-       FFmpegEncoder (boost::shared_ptr<const Film> film, boost::weak_ptr<Job> job, boost::filesystem::path output, Format format);
+       FFmpegEncoder (boost::shared_ptr<const Film> film, boost::weak_ptr<Job> job, boost::filesystem::path output, Format format, bool mixdown_to_stereo);
 
        void go ();
 
@@ -69,6 +73,7 @@ private:
        AVDictionary* _video_options;
        std::string _video_codec_name;
        std::string _audio_codec_name;
+       int _output_audio_channels;
 
        mutable boost::mutex _mutex;
        DCPTime _last_time;
@@ -79,6 +84,12 @@ private:
 
        boost::shared_ptr<AudioBuffers> _pending_audio;
 
+       mutable boost::mutex _queue_mutex;
+       boost::condition _queue_full;
+       std::list<std::pair<boost::shared_ptr<PlayerVideo>, DCPTime> > _queue;
+
+       boost::shared_ptr<Butler> _butler;
+
        static int _video_stream_index;
        static int _audio_stream_index;
 };