X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_file_encoder.h;h=fc2b5c654217f8b9963bae8d2b6d7695da29c198;hb=fcba100f0dfd1d4214291abb76f22ebd696c24d4;hp=d763c7eaf7c05a02fd0cc58b4b5598e7a4bf8785;hpb=4d11fe7cea71b0564df9a21a3cc706509d12b0d1;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_file_encoder.h b/src/lib/ffmpeg_file_encoder.h
index d763c7eaf..fc2b5c654 100644
--- a/src/lib/ffmpeg_file_encoder.h
+++ b/src/lib/ffmpeg_file_encoder.h
@@ -18,18 +18,27 @@
 
 */
 
+
 #ifndef DCPOMATIC_FFMPEG_FILE_ENCODER_H
 #define DCPOMATIC_FFMPEG_FILE_ENCODER_H
 
+
+#include "audio_mapping.h"
 #include "encoder.h"
 #include "event_history.h"
-#include "audio_mapping.h"
 #include "log.h"
 #include <dcp/key.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 }
+LIBDCP_ENABLE_WARNINGS
+
+
+class ExportAudioStream;
+
 
 class FFmpegFileEncoder
 {
@@ -40,16 +49,15 @@ public:
 		int audio_frame_rate,
 		int channels,
 		ExportFormat,
+		bool audio_stream_per_channel,
 		int x264_crf,
 		boost::filesystem::path output
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-		, boost::optional<dcp::Key> key
-		, boost::optional<std::string> id
-#endif
 		);
 
-	void video (boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime);
-	void audio (boost::shared_ptr<AudioBuffers>);
+	~FFmpegFileEncoder ();
+
+	void video (std::shared_ptr<PlayerVideo>, dcpomatic::DCPTime);
+	void audio (std::shared_ptr<AudioBuffers>);
 	void subtitle (PlayerText, dcpomatic::DCPTimePeriod);
 
 	void flush ();
@@ -65,16 +73,15 @@ private:
 	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;
+	AVCodec const * _video_codec = nullptr;
+	AVCodecContext* _video_codec_context = nullptr;
+	std::vector<std::shared_ptr<ExportAudioStream>> _audio_streams;
+	bool _audio_stream_per_channel;
+	AVFormatContext* _format_context = nullptr;
+	AVStream* _video_stream = nullptr;
 	AVPixelFormat _pixel_format;
 	AVSampleFormat _sample_format;
-	AVDictionary* _video_options;
+	AVDictionary* _video_options = nullptr;
 	std::string _video_codec_name;
 	std::string _audio_codec_name;
 	int _audio_channels;
@@ -84,15 +91,18 @@ private:
 	int _video_frame_rate;
 	int _audio_frame_rate;
 
-	boost::shared_ptr<AudioBuffers> _pending_audio;
+	int64_t _audio_frames = 0;
+
+	std::shared_ptr<AudioBuffers> _pending_audio;
 
 	/** 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;
+	std::map<uint8_t*, std::shared_ptr<const Image>> _pending_images;
+	boost::mutex _pending_images_mutex;
 
 	static int _video_stream_index;
-	static int _audio_stream_index;
+	static int _audio_stream_index_base;
 };
 
 #endif