1 files changed, 4 insertions, 49 deletions

diff --git a/src/lib/ffmpeg_encoder.h b/src/lib/ffmpeg_encoder.h
index 37e45a888..98c4704e2 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,24 +24,14 @@
 #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, int x264_crf);
+	FFmpegEncoder (boost::shared_ptr<const Film> film, boost::weak_ptr<Job> job, boost::filesystem::path output, ExportFormat format, bool mixdown_to_stereo, int x264_crf);
 
 	void go ();
 
@@ -52,30 +42,7 @@ public:
 	}
 
 private:
-	void video (boost::shared_ptr<PlayerVideo>, DCPTime);
-	void audio (boost::shared_ptr<AudioBuffers>);
-	void subtitle (PlayerText, 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;
+	FFmpegFileEncoder _file_encoder;
 	int _output_audio_channels;
 
 	mutable boost::mutex _mutex;
@@ -83,19 +50,7 @@ private:
 
 	EventHistory _history;
 
-	boost::filesystem::path _output;
-
-	boost::shared_ptr<AudioBuffers> _pending_audio;
-
 	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;
 };
 
 #endif