WIP: VP9 encoder.

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

diff --git a/src/lib/dcp_encoder.h b/src/lib/dcp_encoder.h
index 65782d968c2580c2bde0d2a7e4b6b4cca227dad2..69ae5b7b29e82b9a03f278dd2eaf0e4a62fb0166 100644 (file)
--- a/src/lib/dcp_encoder.h
+++ b/src/lib/dcp_encoder.h
@@ -18,35 +18,38 @@
 
 */
 
+
 #include "atmos_metadata.h"
-#include "types.h"
-#include "player_text.h"
 #include "dcp_text_track.h"
+#include "dcpomatic_time.h"
 #include "encoder.h"
+#include "player_text.h"
+#include "j2k_encoder.h"
+#include "vp9_encoder.h"
+#include "writer.h"
 #include <dcp/atmos_frame.h>
 
+
+class AudioBuffers;
 class Film;
-class J2KEncoder;
-class Player;
-class Writer;
 class Job;
+class Player;
 class PlayerVideo;
-class AudioBuffers;
 
-/** @class DCPEncoder */
+
 class DCPEncoder : public Encoder
 {
 public:
        DCPEncoder (std::shared_ptr<const Film> film, std::weak_ptr<Job> job);
        ~DCPEncoder ();
 
-       void go ();
+       void go () override;
 
-       boost::optional<float> current_rate () const;
-       Frame frames_done () const;
+       boost::optional<float> current_rate () const override;
+       Frame frames_done () const override;
 
        /** @return true if we are in the process of calling Encoder::process_end */
-       bool finishing () const {
+       bool finishing () const override {
                return _finishing;
        }
 
@@ -57,10 +60,16 @@ private:
        void text (PlayerText, TextType, boost::optional<DCPTextTrack>, dcpomatic::DCPTimePeriod);
        void atmos (std::shared_ptr<const dcp::AtmosFrame>, dcpomatic::DCPTime, AtmosMetadata metadata);
 
-       std::shared_ptr<Writer> _writer;
-       std::shared_ptr<J2KEncoder> _j2k_encoder;
+       void write_pending_audio();
+
+       Writer _writer;
+       J2KEncoder _j2k_encoder;
+       VP9Encoder _vp9_encoder;
        bool _finishing;
        bool _non_burnt_subtitles;
+       bool _sign_language;
+       dcpomatic::DCPTime _last_audio_write_to;
+       std::list<std::pair<std::shared_ptr<AudioBuffers>, dcpomatic::DCPTime>> _pending_audio;
 
        boost::signals2::scoped_connection _player_video_connection;
        boost::signals2::scoped_connection _player_audio_connection;