X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg_encoder.h;h=710364b013840779d0fb80fdd204ca7d57960e75;hp=bd5be454572b62b4ef6e77305d129398250cf31d;hb=da44da6f31f97d39ca91c35955e573e76371f2c2;hpb=d8ea1796f34ff894b148a0af78c0a547e0496ee1

diff --git a/src/lib/ffmpeg_encoder.h b/src/lib/ffmpeg_encoder.h
index bd5be4545..710364b01 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,47 +23,73 @@
 
 #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 (
+		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 ();
 
-	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;
-	std::string _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;
+	};
+
+	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;
+
+	std::shared_ptr<Butler> _butler;
 };
 
 #endif