Another macOS std::list boost::thread SNAFU.

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

diff --git a/src/lib/ffmpeg_encoder.h b/src/lib/ffmpeg_encoder.h
index b5715e514f23e5fd03c20f778e398148bf64cd04..df2dcfcc866f5a7535c697274244dd4a3a02d6fa 100644 (file)
--- a/src/lib/ffmpeg_encoder.h
+++ b/src/lib/ffmpeg_encoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2017-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -23,48 +23,74 @@
 
 #include "encoder.h"
 #include "event_history.h"
-extern "C" {
-#include <libavcodec/avcodec.h>
-#include <libavformat/avformat.h>
-}
+#include "audio_mapping.h"
+#include "ffmpeg_file_encoder.h"
+
+class Butler;
 
 class FFmpegEncoder : public Encoder
 {
 public:
-       enum Format
-       {
-               FORMAT_PRORES,
-               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,
+               ExportFormat format,
+               bool mixdown_to_stereo,
+               bool split_reels,
+               int x264_crf
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+               , boost::optional<dcp::Key> key
+               , boost::optional<std::string> id
+#endif
+               );
 
        void go ();
 
-       float current_rate () const;
+       boost::optional<float> current_rate () const;
        Frame frames_done () const;
        bool finishing () const {
                return false;
        }
 
 private:
-       void video (boost::shared_ptr<PlayerVideo>, DCPTime);
-       void audio (boost::shared_ptr<AudioBuffers>, DCPTime);
-       void subtitle (PlayerSubtitles, DCPTimePeriod);
 
-       AVCodecContext* _codec_context;
-       AVFormatContext* _format_context;
-       AVStream* _video_stream;
-       AVPixelFormat _pixel_format;
-       AVDictionary* _options;
-       std::string _codec_name;
+       class FileEncoderSet
+       {
+       public:
+               FileEncoderSet (
+                       dcp::Size video_frame_size,
+                       int video_frame_rate,
+                       int audio_frame_rate,
+                       int channels,
+                       ExportFormat,
+                       int x264_crf,
+                       bool three_d,
+                       boost::filesystem::path output,
+                       std::string extension
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+                       , boost::optional<dcp::Key> key
+                       , boost::optional<std::string> id
+#endif
+                       );
+
+               boost::shared_ptr<FFmpegFileEncoder> get (Eyes eyes) const;
+               void flush ();
+               void audio (boost::shared_ptr<AudioBuffers>);
+
+       private:
+               std::map<Eyes, boost::shared_ptr<FFmpegFileEncoder> > _encoders;
+       };
+
+       std::list<FileEncoderSet> _file_encoders;
+       int _output_audio_channels;
 
        mutable boost::mutex _mutex;
-       DCPTime _last_time;
+       dcpomatic::DCPTime _last_time;
 
        EventHistory _history;
 
-       boost::filesystem::path _output;
+       boost::shared_ptr<Butler> _butler;
 };
 
 #endif