Add basic quality option for x264 export.

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

diff --git a/src/lib/ffmpeg_encoder.h b/src/lib/ffmpeg_encoder.h
index 5ab59c12dcdcfe640ae5bc5902bc7be58a43d348..51af48d48e6050b62d308e5ce20836d95ff971b3 100644 (file)
--- a/src/lib/ffmpeg_encoder.h
+++ b/src/lib/ffmpeg_encoder.h
@@ -28,6 +28,9 @@ extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 }
+#include <boost/thread/condition.hpp>
+
+class Butler;
 
 class FFmpegEncoder : public Encoder
 {
@@ -38,7 +41,7 @@ public:
                FORMAT_H264
        };
 
-       FFmpegEncoder (boost::shared_ptr<const Film> film, boost::weak_ptr<Job> job, boost::filesystem::path output, Format format, bool mixdown_to_stereo);
+       FFmpegEncoder (boost::shared_ptr<const Film> film, boost::weak_ptr<Job> job, boost::filesystem::path output, Format format, bool mixdown_to_stereo, int x264_crf);
 
        void go ();
 
@@ -50,14 +53,17 @@ public:
 
 private:
        void video (boost::shared_ptr<PlayerVideo>, DCPTime);
-       void audio (boost::shared_ptr<AudioBuffers>, DCPTime);
-       void subtitle (PlayerSubtitles, DCPTimePeriod);
+       void audio (boost::shared_ptr<AudioBuffers>);
+       void subtitle (PlayerText, DCPTimePeriod);
 
        void setup_video ();
        void setup_audio ();
 
        void audio_frame (int size);
 
+       static void buffer_free(void* opaque, uint8_t* data);
+       void buffer_free2(uint8_t* data);
+
        AVCodec* _video_codec;
        AVCodecContext* _video_codec_context;
        AVCodec* _audio_codec;
@@ -70,7 +76,7 @@ private:
        AVDictionary* _video_options;
        std::string _video_codec_name;
        std::string _audio_codec_name;
-       AudioMapping _audio_mapping;
+       int _output_audio_channels;
 
        mutable boost::mutex _mutex;
        DCPTime _last_time;
@@ -81,6 +87,17 @@ 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;
+
+       /** Store of shared_ptr<Image> to keep them alive whilst raw pointers into
+           their data have been passed to FFmpeg.
+       */
+       std::map<uint8_t*, boost::shared_ptr<const Image> > _pending_images;
+
        static int _video_stream_index;
        static int _audio_stream_index;
 };