Trying to create export audio encoders with between 9 and 15 channels

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

diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h
index 0fc598bd79d0fa39a5924452a91ce086f019c176..1abe39a27d7e56bf74bb8a58be4ec557f7b7d301 100644 (file)
--- 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>
@@ -40,7 +41,13 @@ struct dcp_subtitle_within_dcp_test;
 class DCPDecoder : public DCP, public Decoder
 {
 public:
-       DCPDecoder (boost::shared_ptr<const Film> film, boost::shared_ptr<const DCPContent>, bool fast);
+       DCPDecoder (
+               boost::shared_ptr<const Film> film,
+               boost::shared_ptr<const DCPContent>,
+               bool fast,
+               bool tolerant,
+               boost::shared_ptr<DCPDecoder> old
+               );
 
        std::list<boost::shared_ptr<dcp::Reel> > reels () const {
                return _reels;
@@ -52,6 +59,12 @@ public:
        bool pass ();
        void seek (dcpomatic::ContentTime t, bool accurate);
 
+       std::string lazy_digest () const {
+               return _lazy_digest;
+       }
+
+       dcpomatic::ContentTime position () const;
+
 private:
        friend struct dcp_subtitle_within_dcp_test;
 
@@ -66,6 +79,7 @@ private:
                boost::shared_ptr<TextDecoder> decoder,
                dcp::Size size
                );
+       std::string calculate_lazy_digest (boost::shared_ptr<const DCPContent>) const;
 
        /** Time of next thing to return from pass relative to the start of _reel */
        dcpomatic::ContentTime _next;
@@ -80,7 +94,11 @@ 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;
+
+       std::string _lazy_digest;
 };