X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_encoder.h;h=d8ffd2c6b8acc2c23e9abf3cf184c15172d7fe00;hb=372555641062f5c7c6e4a1d5f67cfaf12a2c6799;hp=c7929c54fb6fd5670eee806fef63c174cffa3257;hpb=d628ed776e3ca94b154980e962b1c4a0a8f7540c;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_encoder.h b/src/lib/ffmpeg_encoder.h
index c7929c54f..d8ffd2c6b 100644
--- 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,21 +23,27 @@
 
 #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 ();
 
@@ -48,39 +54,43 @@ public:
 	}
 
 private:
-	void video (boost::shared_ptr<PlayerVideo>, DCPTime);
-	void audio (boost::shared_ptr<AudioBuffers>, DCPTime);
-	void subtitle (PlayerSubtitles, DCPTimePeriod);
-
-	void setup_video ();
-	void setup_audio ();
-
-	void audio_frame (int size);
-
-	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;
 
-	mutable boost::mutex _mutex;
-	DCPTime _last_time;
+	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
+			);
 
-	EventHistory _history;
+		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;
+	};
 
-	boost::filesystem::path _output;
+	std::list<FileEncoderSet> _file_encoders;
+	int _output_audio_channels;
 
-	boost::shared_ptr<AudioBuffers> _pending_audio;
+	mutable boost::mutex _mutex;
+	dcpomatic::DCPTime _last_time;
+
+	EventHistory _history;
 
-	static int _video_stream_index;
-	static int _audio_stream_index;
+	boost::shared_ptr<Butler> _butler;
 };
 
 #endif