Supporters update.

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

diff --git a/src/lib/ffmpeg_encoder.h b/src/lib/ffmpeg_encoder.h
index ca1aa6fbca893f479f19df04b8c7c49f2afc6a39..2d5c6af8703cfd3f8331f40f4a6f7989df40ed21 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.
 
@@ -21,85 +21,78 @@
 #ifndef DCPOMATIC_FFMPEG_ENCODER_H
 #define DCPOMATIC_FFMPEG_ENCODER_H
 
+#include "audio_mapping.h"
+#include "butler.h"
 #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>
+#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, bool mixdown_to_stereo);
-
-       void go ();
-
-       float current_rate () const;
-       Frame frames_done () const;
-       bool finishing () const {
+       FFmpegEncoder (
+               std::shared_ptr<const Film> film,
+               std::weak_ptr<Job> job,
+               boost::filesystem::path output,
+               ExportFormat format,
+               bool mixdown_to_stereo,
+               bool split_reels,
+               bool audio_stream_per_channel,
+               int x264_crf
+               );
+
+       void go () override;
+
+       boost::optional<float> current_rate () const override;
+       Frame frames_done () const override;
+       bool finishing () const override {
                return false;
        }
 
 private:
-       void video (boost::shared_ptr<PlayerVideo>, DCPTime);
-       void audio (boost::shared_ptr<AudioBuffers>);
-       void subtitle (PlayerSubtitles, 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;
-       AVCodecContext* _audio_codec_context;
-       AVFormatContext* _format_context;
-       AVStream* _video_stream;
-       AVStream* _audio_stream;
-       AVPixelFormat _pixel_format;
-       AVSampleFormat _sample_format;
-       AVDictionary* _video_options;
-       std::string _video_codec_name;
-       std::string _audio_codec_name;
+
+       class FileEncoderSet
+       {
+       public:
+               FileEncoderSet (
+                       dcp::Size video_frame_size,
+                       int video_frame_rate,
+                       int audio_frame_rate,
+                       int channels,
+                       ExportFormat,
+                       bool audio_stream_per_channel,
+                       int x264_crf,
+                       bool three_d,
+                       boost::filesystem::path output,
+                       std::string extension
+                       );
+
+               std::shared_ptr<FFmpegFileEncoder> get (Eyes eyes) const;
+               void flush ();
+               void audio (std::shared_ptr<AudioBuffers>);
+
+       private:
+               std::map<Eyes, std::shared_ptr<FFmpegFileEncoder>> _encoders;
+       };
+
+       AudioMapping stereo_map() const;
+       AudioMapping many_channel_map() const;
+
        int _output_audio_channels;
 
        mutable boost::mutex _mutex;
-       DCPTime _last_time;
+       dcpomatic::DCPTime _last_time;
 
        EventHistory _history;
 
        boost::filesystem::path _output;
+       ExportFormat _format;
+       bool _split_reels;
+       bool _audio_stream_per_channel;
+       int _x264_crf;
 
-       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;
+       Butler _butler;
 };
 
 #endif