Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x

[dcpomatic.git] / src / lib / ffmpeg_file_encoder.h

diff --git a/src/lib/ffmpeg_file_encoder.h b/src/lib/ffmpeg_file_encoder.h
index 803125bd3cf677f487a0fd70f9134083fea6e0db..d763c7eaf7c05a02fd0cc58b4b5598e7a4bf8785 100644 (file)
--- 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,18 +39,23 @@ 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 ();
 
+       static AVPixelFormat pixel_format (ExportFormat format);
+
 private:
        void setup_video ();
        void setup_audio ();
@@ -77,7 +83,6 @@ private:
        dcp::Size _video_frame_size;
        int _video_frame_rate;
        int _audio_frame_rate;
-       boost::shared_ptr<Log> _log;
 
        boost::shared_ptr<AudioBuffers> _pending_audio;