X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_decoder.h;h=803c93a86f308c5cf2adddeac502977a2351a46b;hb=5a820bb8fae34591be5ac6d19a73461b9dab532a;hp=0fc598bd79d0fa39a5924452a91ce086f019c176;hpb=c4403784febdbdd42e9c32e67fadb147f11fe566;p=dcpomatic.git

diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h
index 0fc598bd7..803c93a86 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-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,17 +18,20 @@
 
 */
 
+
 /** @file  src/dcp_decoder.h
  *  @brief A decoder of existing DCPs.
  */
 
+
+#include "atmos_metadata.h"
 #include "decoder.h"
-#include "dcp.h"
 #include <dcp/mono_picture_asset_reader.h>
 #include <dcp/stereo_picture_asset_reader.h>
 #include <dcp/sound_asset_reader.h>
 #include <dcp/subtitle_asset.h>
 
+
 namespace dcp {
 	class Reel;
 }
@@ -37,20 +40,33 @@ class DCPContent;
 class Log;
 struct dcp_subtitle_within_dcp_test;
 
-class DCPDecoder : public DCP, public Decoder
+
+class DCPDecoder : public Decoder
 {
 public:
-	DCPDecoder (boost::shared_ptr<const Film> film, boost::shared_ptr<const DCPContent>, bool fast);
+	DCPDecoder (
+		std::shared_ptr<const Film> film,
+		std::shared_ptr<const DCPContent> content,
+		bool fast,
+		bool tolerant,
+		std::shared_ptr<DCPDecoder> old
+		);
 
-	std::list<boost::shared_ptr<dcp::Reel> > reels () const {
+	std::vector<std::shared_ptr<dcp::Reel>> reels () const {
 		return _reels;
 	}
 
 	void set_decode_referenced (bool r);
 	void set_forced_reduction (boost::optional<int> reduction);
 
-	bool pass ();
-	void seek (dcpomatic::ContentTime t, bool accurate);
+	bool pass () override;
+	void seek (dcpomatic::ContentTime t, bool accurate) override;
+
+	std::string lazy_digest () const {
+		return _lazy_digest;
+	}
+
+	dcpomatic::ContentTime position () const override;
 
 private:
 	friend struct dcp_subtitle_within_dcp_test;
@@ -60,27 +76,34 @@ private:
 	void pass_texts (dcpomatic::ContentTime next, dcp::Size size);
 	void pass_texts (
 		dcpomatic::ContentTime next,
-		boost::shared_ptr<dcp::SubtitleAsset> asset,
+		std::shared_ptr<dcp::SubtitleAsset> asset,
 		bool reference,
 		int64_t entry_point,
-		boost::shared_ptr<TextDecoder> decoder,
+		std::shared_ptr<TextDecoder> decoder,
 		dcp::Size size
 		);
+	std::string calculate_lazy_digest (std::shared_ptr<const DCPContent>) const;
+
+	std::shared_ptr<const DCPContent> _dcp_content;
 
 	/** Time of next thing to return from pass relative to the start of _reel */
 	dcpomatic::ContentTime _next;
-	std::list<boost::shared_ptr<dcp::Reel> > _reels;
+	std::vector<std::shared_ptr<dcp::Reel>> _reels;
 
-	std::list<boost::shared_ptr<dcp::Reel> >::iterator _reel;
+	std::vector<std::shared_ptr<dcp::Reel>>::iterator _reel;
 	/** Offset of _reel from the start of the content in frames */
-	int64_t _offset;
+	int64_t _offset = 0;
 	/** Reader for current mono picture asset, if applicable */
-	boost::shared_ptr<dcp::MonoPictureAssetReader> _mono_reader;
+	std::shared_ptr<dcp::MonoPictureAssetReader> _mono_reader;
 	/** Reader for current stereo picture asset, if applicable */
-	boost::shared_ptr<dcp::StereoPictureAssetReader> _stereo_reader;
+	std::shared_ptr<dcp::StereoPictureAssetReader> _stereo_reader;
 	/** Reader for current sound asset, if applicable */
-	boost::shared_ptr<dcp::SoundAssetReader> _sound_reader;
+	std::shared_ptr<dcp::SoundAssetReader> _sound_reader;
+	std::shared_ptr<dcp::AtmosAssetReader> _atmos_reader;
+	boost::optional<AtmosMetadata> _atmos_metadata;
 
-	bool _decode_referenced;
+	bool _decode_referenced = false;
 	boost::optional<int> _forced_reduction;
+
+	std::string _lazy_digest;
 };