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/dcp_decoder.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/dcp_decoder.h')
| -rw-r--r-- | src/lib/dcp_decoder.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h index 4de8c8629..1abe39a27 100644 --- a/src/lib/dcp_decoder.h +++ b/src/lib/dcp_decoder.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net> + Copyright (C) 2014-2020 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -22,6 +22,7 @@ * @brief A decoder of existing DCPs. */ +#include "atmos_metadata.h" #include "decoder.h" #include "dcp.h" #include <dcp/mono_picture_asset_reader.h> @@ -93,6 +94,8 @@ private: boost::shared_ptr<dcp::StereoPictureAssetReader> _stereo_reader; /** Reader for current sound asset, if applicable */ boost::shared_ptr<dcp::SoundAssetReader> _sound_reader; + boost::shared_ptr<dcp::AtmosAssetReader> _atmos_reader; + boost::optional<AtmosMetadata> _atmos_metadata; bool _decode_referenced; boost::optional<int> _forced_reduction; |