X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_file_encoder.h;h=57f9135fa5e88e0a272ca8e601663374caebfd87;hb=5aff601c454fa756c0ab71ae4bcf8f7f4ce28737;hp=63826e2d5169bbe26298d910132f17955b8d440c;hpb=f41310384889e4cfb6e709d098b316e212d8bf22;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_file_encoder.h b/src/lib/ffmpeg_file_encoder.h
index 63826e2d5..57f9135fa 100644
--- a/src/lib/ffmpeg_file_encoder.h
+++ b/src/lib/ffmpeg_file_encoder.h
@@ -25,6 +25,7 @@
 #include "event_history.h"
 #include "audio_mapping.h"
 #include "log.h"
+#include <dcp/key.h>
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
@@ -38,15 +39,18 @@ public:
 		int video_frame_rate,
 		int audio_frame_rate,
 		int channels,
-		boost::shared_ptr<Log> log,
 		ExportFormat,
 		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>, DCPTime);
+	void video (boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime);
 	void audio (boost::shared_ptr<AudioBuffers>);
-	void subtitle (PlayerText, DCPTimePeriod);
+	void subtitle (PlayerText, dcpomatic::DCPTimePeriod);
 
 	void flush ();
 
@@ -79,7 +83,8 @@ private:
 	dcp::Size _video_frame_size;
 	int _video_frame_rate;
 	int _audio_frame_rate;
-	boost::shared_ptr<Log> _log;
+
+	int64_t _audio_frames;
 
 	boost::shared_ptr<AudioBuffers> _pending_audio;
 
@@ -87,6 +92,7 @@ private:
 	    their data have been passed to FFmpeg.
 	*/
 	std::map<uint8_t*, boost::shared_ptr<const Image> > _pending_images;
+	boost::mutex _pending_images_mutex;
 
 	static int _video_stream_index;
 	static int _audio_stream_index;