X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_decoder.h;h=4de8c86299a0af3fc096387f6f3ea3bab3a77033;hb=fa5f3a8bf77209da27acc33cf144e2e4500a2600;hp=b7141f91643d645e76a034e2a0e7d7b1e91bf050;hpb=7a0c2256cbf94d2434ba6e7485517df0a7f894af;p=dcpomatic.git

diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h
index b7141f916..4de8c8629 100644
--- a/src/lib/dcp_decoder.h
+++ b/src/lib/dcp_decoder.h
@@ -23,6 +23,11 @@
  */
 
 #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;
@@ -32,30 +37,65 @@ class DCPContent;
 class Log;
 struct dcp_subtitle_within_dcp_test;
 
-class DCPDecoder : public Decoder
+class DCPDecoder : public DCP, public Decoder
 {
 public:
-	DCPDecoder (boost::shared_ptr<const DCPContent>, boost::shared_ptr<Log> log, 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;
 	}
 
+	void set_decode_referenced (bool r);
+	void set_forced_reduction (boost::optional<int> reduction);
+
+	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;
 
-	bool pass (PassReason, bool accurate);
-	void seek (ContentTime t, bool accurate);
 	void next_reel ();
-
-	std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const;
-	std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod, bool starting) const;
+	void get_readers ();
+	void pass_texts (dcpomatic::ContentTime next, dcp::Size size);
+	void pass_texts (
+		dcpomatic::ContentTime next,
+		boost::shared_ptr<dcp::SubtitleAsset> asset,
+		bool reference,
+		int64_t entry_point,
+		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 */
-	ContentTime _next;
+	dcpomatic::ContentTime _next;
 	std::list<boost::shared_ptr<dcp::Reel> > _reels;
+
 	std::list<boost::shared_ptr<dcp::Reel> >::iterator _reel;
 	/** Offset of _reel from the start of the content in frames */
 	int64_t _offset;
-	boost::shared_ptr<const DCPContent> _dcp_content;
+	/** Reader for current mono picture asset, if applicable */
+	boost::shared_ptr<dcp::MonoPictureAssetReader> _mono_reader;
+	/** Reader for current stereo picture asset, if applicable */
+	boost::shared_ptr<dcp::StereoPictureAssetReader> _stereo_reader;
+	/** Reader for current sound asset, if applicable */
+	boost::shared_ptr<dcp::SoundAssetReader> _sound_reader;
+
+	bool _decode_referenced;
+	boost::optional<int> _forced_reduction;
+
+	std::string _lazy_digest;
 };