diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-06-19 13:30:02 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-06-19 15:07:30 +0200 |
| commit | ca981c8cfa23111e92be329f1c2dfbe3a07b4247 (patch) | |
| tree | 2a0ceab2864691f910c9c7d70127542868f9f8e5 /src/lib/writer.h | |
| parent | cabe0934c60fb6e74bf4c3023bdcb5c68753e5d9 (diff) | |
Make Atmos content work more like other content. Now its MXFsv2.15.82
are re-written, meaning that they can be encrypted.
This (along with the libdcp update) also fixes assorted Atmos bugs.
Diffstat (limited to 'src/lib/writer.h')
| -rw-r--r-- | src/lib/writer.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/writer.h b/src/lib/writer.h index d09b06264..71e04df96 100644 --- a/src/lib/writer.h +++ b/src/lib/writer.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -22,10 +22,12 @@ * @brief Writer class. */ +#include "atmos_metadata.h" #include "types.h" #include "player_text.h" #include "exception_store.h" #include "dcp_text_track.h" +#include <dcp/atmos_frame.h> #include <boost/shared_ptr.hpp> #include <boost/weak_ptr.hpp> #include <boost/thread.hpp> @@ -111,6 +113,7 @@ public: void write (PlayerText text, TextType type, boost::optional<DCPTextTrack>, dcpomatic::DCPTimePeriod period); void write (std::list<boost::shared_ptr<dcpomatic::Font> > fonts); void write (ReferencedReelAsset asset); + void write (boost::shared_ptr<const dcp::AtmosFrame> atmos, dcpomatic::DCPTime time, AtmosMetadata metadata); void finish (); void set_encoder_threads (int threads); @@ -130,6 +133,7 @@ private: std::vector<ReelWriter>::iterator _audio_reel; std::vector<ReelWriter>::iterator _subtitle_reel; std::map<DCPTextTrack, std::vector<ReelWriter>::iterator> _caption_reels; + std::vector<ReelWriter>::iterator _atmos_reel; /** our thread */ boost::thread _thread; |