X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_encoder.h;h=393a6d72eaa58bd1d09670015315a43a18097824;hb=ff639b3cf30afcc097bfd21d39c8d15f466cadd6;hp=9af284e6eedf078d6ef5d05d86b5fb8793af11aa;hpb=14f5424e2bd0f933965901f18b5b1673993e0045;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_encoder.h b/src/lib/ffmpeg_encoder.h
index 9af284e6e..393a6d72e 100644
--- a/src/lib/ffmpeg_encoder.h
+++ b/src/lib/ffmpeg_encoder.h
@@ -32,33 +32,64 @@ class FFmpegEncoder : public Encoder
 {
 public:
 	FFmpegEncoder (
-		boost::shared_ptr<const Film> film,
-		boost::weak_ptr<Job> job,
+		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 ();
+	void go () override;
 
-	float current_rate () const;
-	Frame frames_done () const;
-	bool finishing () const {
+	boost::optional<float> current_rate () const override;
+	Frame frames_done () const override;
+	bool finishing () const override {
 		return false;
 	}
 
 private:
-	std::list<boost::shared_ptr<FFmpegFileEncoder> > _file_encoders;
+
+	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::shared_ptr<Butler> _butler;
+	boost::filesystem::path _output;
+	ExportFormat _format;
+	bool _split_reels;
+	bool _audio_stream_per_channel;
+	int _x264_crf;
+
+	std::shared_ptr<Butler> _butler;
 };
 
 #endif