Allow export with one audio stream per channel.

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

diff --git a/src/lib/ffmpeg_encoder.h b/src/lib/ffmpeg_encoder.h
index 9af284e6eedf078d6ef5d05d86b5fb8793af11aa..4bd264c8bdf6a760cdb251d3b4950557632b8e68 100644 (file)
--- a/src/lib/ffmpeg_encoder.h
+++ b/src/lib/ffmpeg_encoder.h
@@ -38,23 +38,57 @@ public:
                ExportFormat format,
                bool mixdown_to_stereo,
                bool split_reels,
+               bool audio_stream_per_channel,
                int x264_crf
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+               , boost::optional<dcp::Key> key
+               , boost::optional<std::string> id
+#endif
                );
 
        void go ();
 
-       float current_rate () const;
+       boost::optional<float> current_rate () const;
        Frame frames_done () const;
        bool finishing () const {
                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
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+                       , boost::optional<dcp::Key> key
+                       , boost::optional<std::string> id
+#endif
+                       );
+
+               boost::shared_ptr<FFmpegFileEncoder> get (Eyes eyes) const;
+               void flush ();
+               void audio (boost::shared_ptr<AudioBuffers>);
+
+       private:
+               std::map<Eyes, boost::shared_ptr<FFmpegFileEncoder> > _encoders;
+       };
+
+       std::list<FileEncoderSet> _file_encoders;
        int _output_audio_channels;
 
        mutable boost::mutex _mutex;
-       DCPTime _last_time;
+       dcpomatic::DCPTime _last_time;
 
        EventHistory _history;