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

diff --git a/src/lib/ffmpeg_encoder.h b/src/lib/ffmpeg_encoder.h
index 43c0d948b..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.
 
@@ -24,82 +24,72 @@
 #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);
+	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);
-
-	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;
+	};
+
 	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;
+	std::shared_ptr<Butler> _butler;
 };
 
 #endif